Skip to content

Commit

Permalink
Disable cross builds on platforms other than x86_64-linux
Browse files Browse the repository at this point in the history
Needed because evaluation was broken on x86_64-darwin.
  • Loading branch information
edolstra committed Jun 7, 2022
1 parent dbf0d3a commit 5a9d83a
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,9 @@
ln -s ${image} $image
echo "file binary-dist $image" >> $out/nix-support/hydra-build-products
'';
} // builtins.listToAttrs (map (crossSystem: {
}

// builtins.listToAttrs (map (crossSystem: {
name = "nix-${crossSystem}";
value = let
nixpkgsCross = import nixpkgs {
Expand Down Expand Up @@ -649,7 +651,9 @@
doInstallCheck = true;
installCheckFlags = "sysconfdir=$(out)/etc";
};
}) crossSystems)) // (builtins.listToAttrs (map (stdenvName:
}) (if system == "x86_64-linux" then crossSystems else [])))

// (builtins.listToAttrs (map (stdenvName:
nixpkgsFor.${system}.lib.nameValuePair
"nix-${stdenvName}"
nixpkgsFor.${system}."${stdenvName}Packages".nix
Expand Down

0 comments on commit 5a9d83a

Please sign in to comment.