NixOS · Apr 11, 2020 · Apr 11, 2020 · Apr 11, 2020
diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation {
   };
 
   sourceRoot = ".";
-  dontMakeSourcesWritable = true;
 
   nativeBuildInputs = [ bison flex ];
 

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
@@ -292,7 +292,7 @@ rec {
     in runCommand name args
       ''
         mkdir -p $out
-        while IFS= read path; do
+        while IFS= read -r -d $'\0' path; do
           ${lndir}/bin/lndir -silent $path $out
         done < <(${jq}/bin/jq -r <.attrs.json '.paths[]')
         ${postBuild}

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
     ];
 
   sourceRoot = ".";
-  dontMakeSourcesWritable = true;
 
   outputs = [ "out" "bin" "man" "dev" ];
   propagatedBuildOutputs = [];

diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix
@@ -9,7 +9,6 @@ stdenv.mkDerivation {
   };
 
   sourceRoot = ".";
-  dontMakeSourcesWritable = true;
 
   installPhase = ''
     install -Dm644 "FluidR3 GM2-2.SF2" $out/share/soundfonts/FluidR3_GM2-2.sf2

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
@@ -59,7 +59,7 @@
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
 
   # don't have "libgcc_s.so.1" on darwin
-  LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+  env.LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
   configureFlags = [ "--with-libreadline-prefix" ]
     ++ stdenv.lib.optionals stdenv.isSunOS [

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";
+  env.LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec";
 
   configureFlags = [
      "--disable-csharp" "--with-xz"

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
 
   srcs = [ wheel.src pip.src setuptools.src ];
   sourceRoot = ".";
-  dontMakeSourcesWritable = true;
 
   dontUseSetuptoolsBuild = true;
   dontUsePipInstall = true;

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
@@ -862,6 +862,11 @@ unpackPhase() {
         fi
     done
 
+    if [ "$sourceRoot" == "." ]; then
+      mkdir source
+      cd source
+    fi
+
     # Unpack all source archives.
     for i in "${srcs[@]}"; do
         unpackFile "$i"
@@ -897,6 +902,11 @@ unpackPhase() {
         exit 1
     fi
 
+    if [ "$sourceRoot" == "." ]; then
+      cd ..
+      sourceRoot=source
+    fi
+
     echo "source root is $sourceRoot"
 
     # By default, add write permission to the sources.  This is often

diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libpng ];
 
-  LDFLAGS = optional static "-static";
+  env.LDFLAGS = optionalString static "-static";
   # Workaround for crash in cexcept.h. See
   # https://github.com/NixOS/nixpkgs/issues/28106
   preConfigure = ''
@@ -25,15 +25,13 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-system-zlib"
     "--with-system-libpng"
-  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    #"-prefix=$out"
   ];
 
-  postInstall = if stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isWindows then ''
+  postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isWindows) ''
     mv "$out"/bin/optipng{,.exe}
-  '' else null;
+  '';
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://optipng.sourceforge.net/;
     description = "A PNG optimizer";
     license = licenses.zlib;

diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   # Explicitly link against libgcc_s, to work around the infamous
   # "libgcc_s.so.1 must be installed for pthread_cancel to work".
-  LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+  env.LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   preConfigure = ''
     cp ${automake}/share/automake*/config.{sub,guess} config