Merge master into staging-next

2019-12-31 16:35:53 +01:00
parent 0c2adc0fb1 e4d0e33f36
commit 555037a667
31 changed files with 355 additions and 235 deletions
@@ -146,7 +146,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