Compare commits

..

No commits in common. "9c6e3c624038273a9874cfb9899a9c9637d4ea87" and "0ed265db6f349cece70de3c6fabd42dd07e9c589" have entirely different histories.

2 changed files with 77 additions and 141 deletions

View File

@ -30,17 +30,6 @@ nix build
A statically compiled binary will be placed in the `result` directory. A statically compiled binary will be placed in the `result` directory.
A full release, which cross-compiles binaries for all supported platforms, can
be generated by doing:
```
nix build '.#release'
```
*NOTE* that cross-compiling will download a separate build environment for each
target platform, which can take up quite a bit of disk space (>10GB).
gigs).
## Configuration ## Configuration
Domani is configured via a YAML file whose path is given on the command-line. Domani is configured via a YAML file whose path is given on the command-line.

173
flake.nix
View File

@ -5,46 +5,39 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
}; };
outputs = { self, nixpkgs, naersk, fenix }: let outputs = { self, nixpkgs, naersk, fenix }:
let
newBuildTarget = {
nixPkgsSystem,
rustTarget ? nixPkgsSystem,
nativeBuildInputs ? pkgsCross: [],
rustFlags ? pkgsCross: [],
}: {
inherit nixPkgsSystem rustTarget nativeBuildInputs rustFlags;
};
buildTargets = { buildTargets = {
"x86_64-linux" = newBuildTarget { "x86_64-linux" = {
nixPkgsSystem = "x86_64-unknown-linux-musl"; crossSystemConfig = "x86_64-unknown-linux-musl";
rustTarget = "x86_64-unknown-linux-musl";
}; };
"i686-linux" = newBuildTarget { "i686-linux" = {
nixPkgsSystem = "i686-unknown-linux-musl"; crossSystemConfig = "i686-unknown-linux-musl";
rustTarget = "i686-unknown-linux-musl";
}; };
"aarch64-linux" = newBuildTarget { "aarch64-linux" = {
nixPkgsSystem = "aarch64-unknown-linux-musl"; crossSystemConfig = "aarch64-unknown-linux-musl";
rustTarget = "aarch64-unknown-linux-musl";
}; };
# Old Raspberry Pi's # Old Raspberry Pi's
"armv6l-linux" = newBuildTarget { "armv6l-linux" = {
nixPkgsSystem = "armv6l-unknown-linux-musleabihf"; crossSystemConfig = "armv6l-unknown-linux-musleabihf";
rustTarget = "arm-unknown-linux-musleabihf"; rustTarget = "arm-unknown-linux-musleabihf";
}; };
"x86_64-windows" = newBuildTarget { "x86_64-windows" = {
nixPkgsSystem = "x86_64-w64-mingw32"; crossSystemConfig = "x86_64-w64-mingw32";
rustTarget = "x86_64-pc-windows-gnu"; rustTarget = "x86_64-pc-windows-gnu";
nativeBuildInputs = pkgsCross: [ makeBuildPackageAttrs = pkgsCross: {
depsBuildBuild = [
pkgsCross.stdenv.cc pkgsCross.stdenv.cc
pkgsCross.windows.pthreads pkgsCross.windows.pthreads
]; ];
rustFlags = pkgsCross: [ };
"-C" "link-arg=-L${pkgsCross.windows.pthreads}/lib"
];
}; };
}; };
@ -68,29 +61,12 @@
# "$system.cross-$system" for every system. # "$system.cross-$system" for every system.
# #
eachCrossSystem = supportedSystems: callback: eachCrossSystem = supportedSystems: callback:
eachSystem supportedSystems (buildSystem: let eachSystem supportedSystems (buildSystem: builtins.foldl'
pkgs = mkPkgs buildSystem null;
crosses = builtins.foldl'
(inner: targetSystem: inner // { (inner: targetSystem: inner // {
"cross-${targetSystem}" = callback buildSystem targetSystem; "cross-${targetSystem}" = callback buildSystem targetSystem;
}) })
{ default = callback buildSystem buildSystem; } { default = callback buildSystem buildSystem; }
supportedSystems; supportedSystems
in
crosses // (rec {
default = callback buildSystem buildSystem;
release = let
bins = pkgs.symlinkJoin {
name = "${default.name}-all-bins";
paths = builtins.attrValues crosses;
};
in
pkgs.runCommand "${default.name}-release" {} ''
cp -rL "${bins}" "$out"
chmod +w "$out"/bin
(cd "$out"/bin && sha256sum * > sha256.txt)
'';
})
); );
mkPkgs = buildSystem: targetSystem: import nixpkgs ({ mkPkgs = buildSystem: targetSystem: import nixpkgs ({
@ -101,43 +77,55 @@
# build platform (and therefore it's not really cross-compiling). So we # build platform (and therefore it's not really cross-compiling). So we
# only set up the cross-compiling config if the target platform is # only set up the cross-compiling config if the target platform is
# different. # different.
crossSystem.config = buildTargets.${targetSystem}.nixPkgsSystem; crossSystem.config = buildTargets.${targetSystem}.crossSystemConfig;
})); }));
mkToolchain = buildSystem: targetSystem: let in {
buildTarget = buildTargets.${targetSystem}; packages = eachCrossSystem
rustTarget = buildTarget.rustTarget; (builtins.attrNames buildTargets)
fenixPkgs = fenix.packages.${buildSystem}; (buildSystem: targetSystem: let
pkgs = mkPkgs buildSystem null;
pkgsCross = mkPkgs buildSystem targetSystem;
rustTarget = buildTargets.${targetSystem}.rustTarget;
# TODO I'd prefer to use the toolchain file # TODO I'd prefer to use the toolchain file
# https://github.com/nix-community/fenix/issues/123 # https://github.com/nix-community/fenix/issues/123
fenixToolchain = fenixTarget: (builtins.getAttr "toolchainOf" fenixTarget) { #toolchain = fenix.packages.${buildSystem}.fromToolchainFile {
# file = ./rust-toolchain.toml;
# sha256 = "sha256-LU4C/i+maIOqBZagUaXpFyWZyOVfQ3Ah5/JTz7v6CG4=";
#};
fenixPkgs = fenix.packages.${buildSystem};
mkToolchain = fenixPkgs: fenixPkgs.toolchainOf {
channel = "nightly"; channel = "nightly";
date = "2023-07-23"; date = "2023-07-23";
sha256 = "sha256-LU4C/i+maIOqBZagUaXpFyWZyOVfQ3Ah5/JTz7v6CG4="; sha256 = "sha256-LU4C/i+maIOqBZagUaXpFyWZyOVfQ3Ah5/JTz7v6CG4=";
}; };
in
fenixPkgs.combine [ toolchain = fenixPkgs.combine [
(fenixToolchain fenixPkgs).rustc (mkToolchain fenixPkgs).rustc
(fenixToolchain fenixPkgs).rustfmt (mkToolchain fenixPkgs).cargo
(fenixToolchain fenixPkgs).cargo (mkToolchain fenixPkgs.targets.${rustTarget}).rust-std
(fenixToolchain fenixPkgs).clippy
(fenixToolchain (fenixPkgs.targets).${rustTarget}).rust-std
]; ];
buildEnv = buildSystem: targetSystem: let buildPackageAttrs = if
pkgs = mkPkgs buildSystem null; builtins.hasAttr "makeBuildPackageAttrs" buildTargets.${targetSystem}
pkgsCross = mkPkgs buildSystem targetSystem; then
buildTarget = buildTargets.${targetSystem}; buildTargets.${targetSystem}.makeBuildPackageAttrs pkgsCross
in else
rec { {};
nativeBuildInputs = (buildTarget.nativeBuildInputs pkgsCross) ++ [
(mkToolchain buildSystem targetSystem)
# Required for shell because of rust dependency build scripts which naersk-lib = pkgs.callPackage naersk {
# must run on the build system. cargo = toolchain;
pkgs.stdenv.cc rustc = toolchain;
]; };
in
naersk-lib.buildPackage (buildPackageAttrs // rec {
src = ./.;
strictDeps = true;
doCheck = false;
OPENSSL_STATIC = "1"; OPENSSL_STATIC = "1";
OPENSSL_LIB_DIR = "${pkgsCross.pkgsStatic.openssl.out}/lib"; OPENSSL_LIB_DIR = "${pkgsCross.pkgsStatic.openssl.out}/lib";
@ -147,7 +135,7 @@
# fixed some issues with the x86_64-windows cross-compile :shrug: # fixed some issues with the x86_64-windows cross-compile :shrug:
TARGET_CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc"; TARGET_CC = "${pkgsCross.stdenv.cc}/bin/${pkgsCross.stdenv.cc.targetPrefix}cc";
CARGO_BUILD_TARGET = buildTarget.rustTarget; CARGO_BUILD_TARGET = rustTarget;
CARGO_BUILD_RUSTFLAGS = [ CARGO_BUILD_RUSTFLAGS = [
"-C" "target-feature=+crt-static" "-C" "target-feature=+crt-static"
@ -157,49 +145,8 @@
# https://github.com/rust-lang/cargo/issues/4133 # https://github.com/rust-lang/cargo/issues/4133
"-C" "linker=${TARGET_CC}" "-C" "linker=${TARGET_CC}"
] ++ (buildTarget.rustFlags pkgsCross); ];
}; })
in {
packages = eachCrossSystem
(builtins.attrNames buildTargets)
(buildSystem: targetSystem: let
pkgs = mkPkgs buildSystem null;
toolchain = mkToolchain buildSystem targetSystem;
naersk-lib = pkgs.callPackage naersk {
cargo = toolchain;
rustc = toolchain;
};
in
naersk-lib.buildPackage (rec {
src = ./.;
strictDeps = true;
doCheck = false;
release = true;
postInstall = ''
cd "$out"/bin
for f in "$(ls)"; do
if ext="$(echo "$f" | grep -oP '\.[a-z]+$')"; then
base="$(echo "$f" | cut -d. -f1)"
mv "$f" "$base-${targetSystem}$ext"
else
mv "$f" "$f-${targetSystem}"
fi
done
'';
} // (buildEnv buildSystem targetSystem))
);
devShells = eachCrossSystem
(builtins.attrNames buildTargets)
(buildSystem: targetSystem: let
pkgs = mkPkgs buildSystem null;
toolchain = mkToolchain buildSystem targetSystem;
in
pkgs.mkShell ({
inputsFrom = []; # extra packages for dev
} // (buildEnv buildSystem targetSystem))
); );
}; };
} }