diff options
| author | John Ericson <git@JohnEricson.me> | 2019-12-30 16:40:43 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-30 16:40:43 -0800 |
| commit | cfd013813e97f9bdef009a7d0f891872275e4da2 (patch) | |
| tree | 35770778be2b98841be7fac886e182b1ff4de22d /pkgs/build-support/bintools-wrapper | |
| parent | 66bf75415f4e7a1571d41a2fed11838eb530376b (diff) | |
| parent | c1fb358a78862c7ffb90f6f7a319935fb73039b4 (diff) | |
| download | nixpkgs-cfd013813e97f9bdef009a7d0f891872275e4da2.tar nixpkgs-cfd013813e97f9bdef009a7d0f891872275e4da2.tar.gz nixpkgs-cfd013813e97f9bdef009a7d0f891872275e4da2.tar.bz2 nixpkgs-cfd013813e97f9bdef009a7d0f891872275e4da2.tar.lz nixpkgs-cfd013813e97f9bdef009a7d0f891872275e4da2.tar.xz nixpkgs-cfd013813e97f9bdef009a7d0f891872275e4da2.tar.zst nixpkgs-cfd013813e97f9bdef009a7d0f891872275e4da2.zip | |
Merge pull request #74090 from obsidiansystems/ghcjs-cross-without-cc
stdenv, haskell: bonafied GHCJS cross compilation without stdenv.cc
Diffstat (limited to 'pkgs/build-support/bintools-wrapper')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index c60abdd03e8..84020505a63 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -66,7 +66,7 @@ let else null; expand-response-params = - if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" + if buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null" then import ../expand-response-params { inherit (buildPackages) stdenv; } else ""; |