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/development/interpreters | |
| 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/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 89979e18bdc..1f3b63625c0 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -144,7 +144,7 @@ let substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \ --replace "${libcInc}" /no-such-path \ --replace "${ - if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path" + if stdenv.hasCC then stdenv.cc.cc else "/no-such-path" }" /no-such-path \ --replace "${stdenv.cc}" /no-such-path \ --replace "$man" /no-such-path |