colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

try to do cross-compiling in a slightly less hacky way

Browse Source
This commit is contained in:
colin
2023-01-11 07:22:21 +00:00
parent cc5cf9b6f4
commit 917afe209e
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
flake.nix
View File

@@ -72,18 +72,10 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(import "${mobile-nixos}/overlay/overlay.nix") (import "${mobile-nixos}/overlay/overlay.nix")
uninsane.overlay uninsane.overlay
(import ./pkgs/overlay.nix) ] ++ (builtins.attrValues self.overlays)
(next: prev: rec { ++ [
# non-emulated packages build *from* local *for* target. (next: prev: {
# for large packages like the linux kernel which are expensive to build under emulation, cross = next.crossFrom."${local}";
# the config can explicitly pull such packages from `pkgs.cross` to do more efficient cross-compilation.
cross = (nixpkgsFor local target) // (customPackagesFor local target);
stable = nixpkgs-stable.legacyPackages."${target}";
# cross-compatible packages
# gocryptfs = cross.gocryptfs;
# pinned packages:
}) })
]; ];
} }
@@ -120,10 +112,29 @@
rescue = decl-bootable-host { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; }; rescue = decl-bootable-host { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; };
}; };
in { in {
# TODO: use catAttrs?
nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfiguration) hosts; nixosConfigurations = builtins.mapAttrs (name: value: value.nixosConfiguration) hosts;
imgs = builtins.mapAttrs (name: value: value.img) hosts; imgs = builtins.mapAttrs (name: value: value.img) hosts;
overlays = rec {
pkgs = (import ./pkgs/overlay.nix);
stable = (next: prev: {
stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform}";
});
cross = (next: prev: {
# non-emulated packages build *from* local *for* target.
# for large packages like the linux kernel which are expensive to build under emulation,
# the config can explicitly pull such packages from `pkgs.cross` to do more efficient cross-compilation.
# crossFrom."x86_64-linux" = (nixpkgsFor "x86_64-linux" prev.stdenv.buildPlatform) // (customPackagesFor local target);
crossFrom."x86_64-linux" = (prev.forceSystem "x86_64-linux" null).appendOverlays next.overlays;
crossFrom."aarch64-linux" = (prev.forceSystem "x86_64-linux" null).appendOverlays next.overlays;
# cross-compatible packages
# gocryptfs = cross.gocryptfs;
# pinned packages:
});
};
packages = packages =
let let
allPkgsFor = sys: (customPackagesFor sys sys) // { allPkgsFor = sys: (customPackagesFor sys sys) // {