NixOS · Apr 26, 2021 · Apr 26, 2021 · Apr 26, 2021 · Apr 26, 2021 · Apr 26, 2021
diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
@@ -29,11 +29,11 @@ buildGoModule rec {
 
   buildInputs = optional pamSupport pam;
 
-  buildFlags = [ "-tags" ];
-
-  buildFlagsArray =
-    (  optional sqliteSupport "sqlite"
-    ++ optional pamSupport "pam");
+  buildFlags = [
+    "-tags"
+      ( optionalString sqliteSupport "sqlite"
+      + optionalString pamSupport " pam")
+  ];
 
   postInstall = ''
 

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -129,20 +129,20 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''
-    install -D ${override} ${DESTDIR}/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override
+    install -D ${override} ${env.DESTDIR}/$out/share/glib-2.0/schemas/org.gnome.login-screen.gschema.override
   '';
 
   postInstall = ''
     # Move stuff from DESTDIR to proper location.
     # We use rsync to merge the directories.
-    rsync --archive "${DESTDIR}/etc" "$out"
-    rm --recursive "${DESTDIR}/etc"
-    for o in $outputs; do
-        rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")"
-        rm --recursive "${DESTDIR}/''${!o}"
+    rsync --archive "${env.DESTDIR}/etc" "$out"
+    rm --recursive "${env.DESTDIR}/etc"
+    for o in "''${outputs[@]}"; do
+        rsync --archive "${env.DESTDIR}/''${o}" "$(dirname "''${o}")"
+        rm --recursive "${env.DESTDIR}/''${o}"
     done
     # Ensure the DESTDIR is removed.
-    rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}"
+    rmdir "${env.DESTDIR}/nix/store" "${env.DESTDIR}/nix" "${env.DESTDIR}"
 
     # We are setting DESTDIR so the post-install script does not compile the schemas.
     glib-compile-schemas "$out/share/glib-2.0/schemas"
@@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
   # at install time but Meson does not support this
   # so we need to convince it to install all files to a temporary
   # location using DESTDIR and then move it to proper one in postInstall.
-  DESTDIR = "${placeholder "out"}/dest";
+  env.DESTDIR = "${placeholder "out"}/dest";
 
   passthru = {
     updateScript = gnome3.updateScript {

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -125,7 +125,7 @@ let self = stdenv.mkDerivation rec {
   '';
 
   # Install udev files into our own tree.
-  PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
+  env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
 
   passthru = {
     libdir = "${self}/lib/mutter-7";

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
@@ -309,7 +309,8 @@ stdenv.mkDerivation ({
   buildInputs = otherBuildInputs ++ optionals (!isLibrary) propagatedBuildInputs;
   propagatedBuildInputs = optionals isLibrary propagatedBuildInputs;
 
-  LANG = "en_US.UTF-8";         # GHC needs the locale configured during the Haddock phase.
+  env.LANG = "en_US.UTF-8";         # GHC needs the locale configured during the Haddock phase.
+  env.LOCALE_ARCHIVE = optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
 
   prePatch = optionalString (editedCabalFile != null) ''
     echo "Replace Cabal file with edited version from ${newCabalFileUrl}."
@@ -334,7 +335,7 @@ stdenv.mkDerivation ({
     mkdir -p $packageConfDir
 
     setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
-    configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
+    configureFlags=(${concatStringsSep " " defaultConfigureFlags} "''${configureFlags[@]}")
   ''
   # We build the Setup.hs on the *build* machine, and as such should only add
   # dependencies for the build machine.
@@ -351,16 +352,16 @@ stdenv.mkDerivation ({
     for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
       ${buildPkgDb ghc.name "$packageConfDir"}
       if [ -d "$p/include" ]; then
-        configureFlags+=" --extra-include-dirs=$p/include"
+        configureFlags+=("--extra-include-dirs=$p/include")
       fi
       if [ -d "$p/lib" ]; then
-        configureFlags+=" --extra-lib-dirs=$p/lib"
+        configureFlags+=("--extra-lib-dirs=$p/lib")
       fi
     ''
     # It is not clear why --extra-framework-dirs does work fine on Linux
     + optionalString (!stdenv.buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") ''
       if [[ -d "$p/Library/Frameworks" ]]; then
-        configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
+        configureFlags+=("--extra-framework-dirs=$p/Library/Frameworks")
       fi
   '' + ''
     done
@@ -422,8 +423,8 @@ stdenv.mkDerivation ({
 
     unset GHC_PACKAGE_PATH      # Cabal complains if this variable is set during configure.
 
-    echo configureFlags: $configureFlags
-    ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
+    echo configureFlags: "''${configureFlags[@]}"
+    ${setupCommand} configure "''${configureFlags[@]}" 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log"
     ${lib.optionalString (!allowInconsistentDependencies) ''
       if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then
         echo >&2 "*** abort because of serious configure-time warning from Cabal"
@@ -615,21 +616,24 @@ stdenv.mkDerivation ({
       in stdenv.mkDerivation ({
         inherit name shellHook;
 
+        dontUnpack = true;
+
         depsBuildBuild = lib.optional isCross ghcEnvForBuild;
         nativeBuildInputs =
           [ ghcEnv ] ++ optional (allPkgconfigDepends != []) pkg-config ++
           collectedToolDepends;
         buildInputs =
           otherBuildInputsSystem;
-        phases = ["installPhase"];
-        installPhase = "echo $nativeBuildInputs $buildInputs > $out";
-        LANG = "en_US.UTF-8";
-        LOCALE_ARCHIVE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
-        "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
-        "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
+        installPhase = ''
+          echo "''${nativeBuildInputs[@]}" "''${buildInputs[@]}" > $out
+        '';
+        env.LANG = "en_US.UTF-8";
+        env.LOCALE_ARCHIVE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+        env."NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
+        env."NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
         # TODO: is this still valid?
-        "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html";
-        "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false
+        env."NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html";
+        env."NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false
           then "${ghcEnv}/lib/HaLVM-${ghc.version}"
           else "${ghcEnv}/lib/${ghcCommand}-${ghc.version}";
       });
@@ -670,6 +674,5 @@ stdenv.mkDerivation ({
 // optionalAttrs (args ? postFixup)              { inherit postFixup; }
 // optionalAttrs (args ? dontStrip)              { inherit dontStrip; }
 // optionalAttrs (args ? hardeningDisable)       { inherit hardeningDisable; }
-// optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
 )
 )
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     zlib
   ] ++ lib.optionals withPolkit [ polkit acl usbutils ] ;
 
-  PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
+  env.PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
 
   mesonFlags = [
     "-Dcelt051=disabled"

diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -63,7 +63,7 @@ buildPythonPackage rec {
     "test_role_handler_positive"
   ];
 
-  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ];
+  makeWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ ansible ]) ];
 
   meta = with lib; {
     homepage = "https://github.com/ansible-community/ansible-lint";

diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   pythonNamespaces = [ "jaraco" ];
 
-  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [ setuptools_scm toml ];
 

diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix
@@ -19,11 +19,11 @@ buildGoModule rec {
     rm net/net_test.go
   '';
 
-  buildFlagsArray = [
-    "-ldflags="
-    "-s"
-    "-w"
-    "-X github.com/${owner}/${pname}/v3/version.Version=${rev}"
+  buildFlags = [
+    ("-ldflags="
+      + "-s"
+      + " -w"
+      + " -X github.com/${owner}/${pname}/v3/version.Version=${rev}")
   ];
 
   meta = with lib; {

diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix
@@ -18,8 +18,8 @@ rustPlatform.buildRustPackage rec {
   checkFlags = [
     # Username and Password use the same ports and causes collision
     # https://github.com/mbrubeck/agate/issues/50
-    "--skip username"
-    "--skip password"
+    "--skip" "username"
+    "--skip" "password"
   ];
 
   doInstallCheck = true;

diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -7,10 +7,10 @@ stdenv.mkDerivation {
     sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114";
   };
   buildInputs = [ apacheAnt jdk ];
-  PREFIX = "\${env.out}";
-  AXIS2_LIB = "${axis2}/lib";
-  AXIS2_WEBAPP = "${axis2}/webapps/axis2";
-  DBUS_JAVA_LIB = "${dbus_java}/share/java";
+  env.PREFIX = "\${env.out}";
+  env.AXIS2_LIB = "${axis2}/lib";
+  env.AXIS2_WEBAPP = "${axis2}/webapps/axis2";
+  env.DBUS_JAVA_LIB = "${dbus_java}/share/java";
   prePatch = ''
     sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \
        -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \

diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix
@@ -3,8 +3,9 @@
 stdenv.mkDerivation {
   name = "gnupg1compat-${gnupg.version}";
 
-  builder = writeScript "gnupg1compat-builder" ''
-    PATH=${coreutils}/bin
+  dontUnpack = true;
+
+  installPhase = ''
     # First symlink all top-level dirs
     mkdir -p $out
     ln -s "${gnupg}/"* $out
@@ -20,6 +21,8 @@ stdenv.mkDerivation {
       [[ -e ''${f%2} ]] && continue # ignore commands that already have non-*2 versions
       ln -s -- "''${f##*/}" "''${f%2}"
     done
+
+    rm $out/lib
   '';
 
   meta = gnupg.meta // {