diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-10-30 13:32:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 13:32:13 -0500 |
| commit | 989b403c7feabeaf0dcd62c67670aa6f9f1786a2 (patch) | |
| tree | 7ea70f701bec7872727a924639aa86383daa3052 /pkgs/build-support/cc-wrapper | |
| parent | 0126c86672b7d14843225df16ddfefd7091eabe7 (diff) | |
| parent | 48309677368e3fac5489326e00f1d6b0513d2b8e (diff) | |
| download | nixpkgs-989b403c7feabeaf0dcd62c67670aa6f9f1786a2.tar nixpkgs-989b403c7feabeaf0dcd62c67670aa6f9f1786a2.tar.gz nixpkgs-989b403c7feabeaf0dcd62c67670aa6f9f1786a2.tar.bz2 nixpkgs-989b403c7feabeaf0dcd62c67670aa6f9f1786a2.tar.lz nixpkgs-989b403c7feabeaf0dcd62c67670aa6f9f1786a2.tar.xz nixpkgs-989b403c7feabeaf0dcd62c67670aa6f9f1786a2.tar.zst nixpkgs-989b403c7feabeaf0dcd62c67670aa6f9f1786a2.zip | |
Merge pull request #96318 from matthewbauer/provide-patchelf-in-native-stdenv
stdenv/native: provide patchelf on linux
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -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 0e4e76d7284..09cef8b8678 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 ""; |