From 5dfe6fd0344143a2e9b38c393c8ce03c3a36af25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 May 2016 21:37:27 +0200 Subject: [PATCH] perl: fix evaluation on cygwin ... and maybe on other platforms that have `stdenv.cc.cc == null`. No hash changes where it did evaluate previously. Discussion: https://github.com/NixOS/nixpkgs/commit/b291f1682f#commitcomment-17558440 --- pkgs/development/interpreters/perl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index d3ee18e2ac8..11a7acd617c 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -102,7 +102,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 ''; # */