diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-07-25 10:22:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 10:22:57 -0400 |
| commit | f5364327e8c6a35fdafe9f3c2f4b8e4e01fccace (patch) | |
| tree | 49e207f0fbee22456de717d98be03fa092951462 /pkgs | |
| parent | 059c2312be70ce5734ffa7c4bf3f1973a8d25236 (diff) | |
| parent | 87357fc39c170c16b83d07fa24063a12534e8097 (diff) | |
| download | nixlib-f5364327e8c6a35fdafe9f3c2f4b8e4e01fccace.tar nixlib-f5364327e8c6a35fdafe9f3c2f4b8e4e01fccace.tar.gz nixlib-f5364327e8c6a35fdafe9f3c2f4b8e4e01fccace.tar.bz2 nixlib-f5364327e8c6a35fdafe9f3c2f4b8e4e01fccace.tar.lz nixlib-f5364327e8c6a35fdafe9f3c2f4b8e4e01fccace.tar.xz nixlib-f5364327e8c6a35fdafe9f3c2f4b8e4e01fccace.tar.zst nixlib-f5364327e8c6a35fdafe9f3c2f4b8e4e01fccace.zip | |
Merge pull request #44081 from obsidiansystems/stdenv-cross-allowedRequisites
cross stdenv: Forget `allowedRequisites = nulll;` on inline
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 29521874d1eb..bc8d772530a1 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -43,6 +43,7 @@ in lib.init bootStages ++ [ # a different platform, and so are disabled. overrides = _: _: {}; extraBuildInputs = [ ]; # Old ones run on wrong platform + allowedRequisites = null; cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3605640430be..1b22f261ab10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34,7 +34,8 @@ with pkgs; extraPackages = []; inherit bintools; }; - allowedRequisites = stdenv.allowedRequisites ++ [ bintools ]; + allowedRequisites = + lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null); }; # For convenience, allow callers to get the path to Nixpkgs. |