diff options
| -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. |