diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
| commit | 2d382f3d981fc9e4a350badb43736c252415d27c (patch) | |
| tree | 3d5f7a96aa71be52c86f3c243b23424e319cc286 /pkgs/development/interpreters/perl/default.nix | |
| parent | 365379857fb561df949fc841e80458e317a1d682 (diff) | |
| parent | 2661511cdb39bd7612dd5311b46420785fc1eac8 (diff) | |
| download | nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.gz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.bz2 nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.lz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.xz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.zst nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/interpreters/perl/default.nix')
| -rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 440acad1b476..3802a43348ba 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -105,7 +105,9 @@ let # TODO: removing those paths would be cleaner than overwriting with nonsense. substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \ --replace "${libcInc}" /no-such-path \ - --replace "${stdenv.cc.cc or "/no-such-path"}" /no-such-path \ + --replace "${ + if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path" + }" /no-such-path \ --replace "$man" /no-such-path ''; # */ |