NixOS · Apr 8, 2020 · Apr 8, 2020 · Apr 9, 2020 · Apr 9, 2020 · Apr 9, 2020
diff --git a/pkgs/applications/misc/rxvt-unicode/default.nix b/pkgs/applications/misc/rxvt-unicode/default.nix
@@ -55,8 +55,8 @@ stdenv.mkDerivation {
     (enableFeature unicode3Support "unicode3")
   ];
 
-  LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ];
-  CFLAGS = [ "-I${freetype.dev}/include/freetype2" ];
+  env.LDFLAGS = "-lfontconfig -lXrender -lpthread";
+  env.CFLAGS = "-I${freetype.dev}/include/freetype2";
 
   preConfigure =
     ''

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
@@ -10,12 +10,14 @@ let
   # resulting store derivations (.drv files) much smaller, which in
   # turn makes nix-env/nix-instantiate faster.
   mirrorsFile =
-    buildPackages.runCommandNoCCLocal "mirrors-list" {
+    stdenvNoCC.mkDerivation {
+      name = "mirrors-list";
       env = stdenvNoCC.lib.mapAttrs (k: m: toString m) mirrors;
-    } ''
-      # !!! this is kinda hacky.
-      set | grep -E '^[a-zA-Z]+=.*://' > $out
-    '';
+      buildCommand = ''
+        # !!! this is kinda hacky.
+        set | grep -E '^[a-zA-Z]+=.*://' > $out
+      '';
+    };
 
   # Names of the master sites that are mirrored (i.e., "sourceforge",
   # "gnu", etc.).

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, stdenvNoCC, lndir, runtimeShell }:
+{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, jq }:
 
 let
 
@@ -287,15 +287,14 @@ rec {
     let
       args = removeAttrs args_ [ "name" "postBuild" ]
         // {
-          inherit preferLocalBuild allowSubstitutes;
-          passAsFile = [ "paths" ];
+          inherit preferLocalBuild allowSubstitutes paths;
         }; # pass the defaults
     in runCommand name args
       ''
         mkdir -p $out
-        for i in $(cat $pathsPath); do
-          ${lndir}/bin/lndir -silent $i $out
-        done
+        while IFS= read path; do
+          ${lndir}/bin/lndir -silent $path $out
+        done < <(${jq}/bin/jq -r <.attrs.json '.paths[]')
         ${postBuild}
       '';
 

diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -34,7 +34,7 @@ mkDerivation {
   postPatch = ''
     sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
   '';
-  CXXFLAGS = [
+  env.CXXFLAGS = toString [
     "-I${lib.getDev xorgserver}/include/xorg"
     ''-DNIXPKGS_HWCLOCK=\"${lib.getBin utillinux}/sbin/hwclock\"''
   ];

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -48,7 +48,7 @@ let
                     # Propagate $dev so that this setup hook is propagated
                     # But only if there is a separate $dev output
                     if [ "''${outputDev:?}" != out ]; then
-                        propagatedBuildInputs="''${propagatedBuildInputs-} @dev@"
+                        propagatedBuildInputs+=("@dev@")
                     fi
                 fi
               '';

diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
@@ -6,49 +6,49 @@ addEnvHooks "$targetOffset" ecmEnvHook
 
 ecmPostHook() {
     # Because we need to use absolute paths here, we must set *all* the paths.
-    cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
-    cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
-    cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
-    cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
-    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec"
-    cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
-    cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
-    cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
-    cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share"
-    cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputBin}/share"
-    cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML"
-    cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg"
-    cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update"
-    cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5"
-    cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5"
-    cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5"
-    cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5"
-    cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons"
-    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
-    cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds"
-    cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates"
-    cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers"
-    cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputBin}/share/applications"
-    cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories"
-    cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages"
-    cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata"
-    cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputBin}/share/man"
-    cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputBin}/share/info"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services"
-    cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc"
-    cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg"
-    cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart"
+    cmakeFlags+=("-DKDE_INSTALL_EXECROOTDIR=${!outputBin}")
+    cmakeFlags+=("-DKDE_INSTALL_BINDIR=${!outputBin}/bin")
+    cmakeFlags+=("-DKDE_INSTALL_SBINDIR=${!outputBin}/sbin")
+    cmakeFlags+=("-DKDE_INSTALL_LIBDIR=${!outputLib}/lib")
+    cmakeFlags+=("-DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec")
+    cmakeFlags+=("-DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake")
+    cmakeFlags+=("-DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include")
+    cmakeFlags+=("-DKDE_INSTALL_LOCALSTATEDIR=/var")
+    cmakeFlags+=("-DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share")
+    cmakeFlags+=("-DKDE_INSTALL_DATADIR=${!outputBin}/share")
+    cmakeFlags+=("-DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML")
+    cmakeFlags+=("-DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg")
+    cmakeFlags+=("-DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update")
+    cmakeFlags+=("-DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5")
+    cmakeFlags+=("-DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5")
+    cmakeFlags+=("-DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5")
+    cmakeFlags+=("-DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5")
+    cmakeFlags+=("-DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons")
+    cmakeFlags+=("-DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale")
+    cmakeFlags+=("-DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds")
+    cmakeFlags+=("-DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates")
+    cmakeFlags+=("-DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers")
+    cmakeFlags+=("-DKDE_INSTALL_APPDIR=${!outputBin}/share/applications")
+    cmakeFlags+=("-DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories")
+    cmakeFlags+=("-DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages")
+    cmakeFlags+=("-DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata")
+    cmakeFlags+=("-DKDE_INSTALL_MANDIR=${!outputBin}/share/man")
+    cmakeFlags+=("-DKDE_INSTALL_INFODIR=${!outputBin}/share/info")
+    cmakeFlags+=("-DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1")
+    cmakeFlags+=("-DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces")
+    cmakeFlags+=("-DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services")
+    cmakeFlags+=("-DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services")
+    cmakeFlags+=("-DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc")
+    cmakeFlags+=("-DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg")
+    cmakeFlags+=("-DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart")
 
     if [ -n "${qtPluginPrefix-}" ]; then
-        cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix"
-        cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix"
+        cmakeFlags+=("-DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix")
+        cmakeFlags+=("-DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix")
     fi
 
     if [ -n "${qtQmlPrefix-}" ]; then
-        cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix"
+        cmakeFlags+=("-DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix")
     fi
 }
 postHooks+=(ecmPostHook)
@@ -106,7 +106,7 @@ ecmHostPathHook() {
 
     if [ -d "$1/dbus-1" ]
     then
-        propagatedUserEnvPkgs+=" $1"
+        propagatedUserEnvPkgs+=("$1")
     fi
 }
 addEnvHooks "$targetOffset" ecmHostPathHook
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
@@ -40,8 +40,8 @@ common = rec { # attributes common to both builds
     ncurses openssl zlib pcre libiconv curl
   ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ]
     ++ optionals stdenv.hostPlatform.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]
-    ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ jemalloc450 ]
-    ++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) [ jemalloc ];
+    ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) jemalloc450
+    ++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) jemalloc;
 
   prePatch = ''
     sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
@@ -202,6 +202,6 @@ server = stdenv.mkDerivation (common // {
     wrapProgram $out/bin/mytop --set PATH ${makeBinPath [ less ncurses ]}
   '';
 
-  CXXFLAGS = optionalString stdenv.hostPlatform.isi686 "-fpermissive";
+  env.CXXFLAGS = optionalString stdenv.hostPlatform.isi686 "-fpermissive";
 });
 in mariadb
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
@@ -103,6 +103,7 @@ in rec {
     assert lib.isList (attrs.installTargets or []);
     assert !(attrs ? CFLAGS);
     assert !(attrs ? CXXFLAGS);
+    assert !(attrs ? LDFLAGS);
     assert !(attrs ? NIX_LDFLAGS);
     assert !(attrs ? NIX_CFLAGS_COMPILE);
     assert !(attrs ? NIX_CFLAGS_LINK);

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
@@ -72,7 +72,7 @@ let
   trivialBuilders = self: super:
     import ../build-support/trivial-builders.nix {
       inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.pkgsBuildHost.xorg) lndir;
-      inherit (self) runtimeShell;
+      inherit (self) runtimeShell; inherit (self.pkgsBuildHost) jq;
     };
 
   stdenvBootstappingAndPlatforms = self: super: let