diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-06-07 13:56:57 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2022-06-07 14:27:06 +0200 |
| commit | 5a9d83aa59df15ea9e289157518f64818036e020 (patch) | |
| tree | f35c2d7c0c1ac88f1214cc405f15ccc46ae13a76 | |
| parent | dbf0d3a150ef01b5451c1a04e6a6bcd67a3e4a86 (diff) | |
Disable cross builds on platforms other than x86_64-linux
Needed because evaluation was broken on x86_64-darwin.
| -rw-r--r-- | flake.nix | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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 { @@ -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 |