Merge remote-tracking branch 'upstream/master' into wrapper-pname-support

2019-11-24 17:25:07 +00:00
parent 9b090ccbca 195c263a81
commit d0d5136cce
5772 changed files with 168373 additions and 134383 deletions
@@ -134,8 +134,6 @@ stdenv.mkDerivation {

  installPhase =
    ''
-      set -u
-
      mkdir -p $out/bin $out/nix-support

      wrap() {
@@ -224,8 +222,6 @@ stdenv.mkDerivation {

  postFixup =
    ''
-      set -u
-
      # Backwards compatability for packages expecting this file, e.g. with
      # `$NIX_CC/nix-support/dynamic-linker`.
      #