diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-01 10:11:12 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-01 10:11:12 +0100 |
commit | 83dde6c52c72bbc941525e8688f97ec65240432d (patch) | |
tree | 252817588d902c5952cb49be3871ab9d882ceb29 /pkgs/build-support/cc-wrapper/default.nix | |
parent | b57adad0851ee7171676cfc168518fa23418d265 (diff) | |
parent | 7a8d5dc8a676a528186ea0f2ece97e832d784562 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support/cc-wrapper/default.nix')
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 0e4e76d72843a..09cef8b8678d1 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -57,7 +57,7 @@ let suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; expand-response-params = - if buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null" + if (buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null" then import ../expand-response-params { inherit (buildPackages) stdenv; } else ""; |