NixOS · Apr 1, 2020
diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix
@@ -78,10 +78,9 @@ stdenv.mkDerivation rec {
     "RacketLib=${racket}/lib/racket"
     "LIBPATH=${stdenv.lib.makeLibraryPath libs}"
     "DESTDIR=build"
+    "Prefix=${placeholder "out"}"
   ];
-  configurePhase = ''
-    sconsFlags+=" Prefix=$out"
-  '';
+
   installPhase = ''
     mkdir -p $out
     cp -r build$out/* $out/

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
@@ -17,14 +17,18 @@ stdenv.mkDerivation rec {
 
   prefixKey = "PREFIX=";
 
+  sconsFlags = [
+    "OPENSSL=${openssl}"
+    "ZLIB=${zlib}"
+  ] ++ stdenv.lib.optional (!stdenv.isCygwin)
+    "GSSAPI=${kerberos.dev}";
+
   preConfigure = ''
-    sconsFlags+=" APR=$(echo ${apr.dev}/bin/*-config)"
-    sconsFlags+=" APU=$(echo ${aprutil.dev}/bin/*-config)"
-    sconsFlags+=" CC=$CC"
-    sconsFlags+=" OPENSSL=${openssl}"
-    sconsFlags+=" ZLIB=${zlib}"
-  '' + stdenv.lib.optionalString (!stdenv.isCygwin) ''
-    sconsFlags+=" GSSAPI=${kerberos.dev}"
+    sconsFlags+=(
+      "APR=$(echo ${apr.dev}/bin/*-config)"
+      "APU=$(echo ${aprutil.dev}/bin/*-config)"
+      "CC=$CC"
+    )
   '';
 
   enableParallelBuilding = true;

diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
@@ -20,10 +20,8 @@ stdenv.mkDerivation rec {
     "boost_libdir=${boost.out}/lib"
     "boost_bundled_enable=false"
   ];
-  preInstall = ''
-    installTargets="$out"
-    installFlags+=" SWIFT_INSTALLDIR=$out"
-  '';
+  installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ];
+  installTargets = [ "${placeholder "out"}" ];
 
   enableParallelBuilding = true;
 

diff --git a/pkgs/development/tools/build-managers/scons/setup-hook.sh b/pkgs/development/tools/build-managers/scons/setup-hook.sh
@@ -11,8 +11,8 @@ sconsBuildPhase() {
 
     local flagsArray=(
       ${enableParallelBuilding:+-j${NIX_BUILD_CORES}}
-      $sconsFlags ${sconsFlagsArray[@]}
-      $buildFlags ${buildFlagsArray[@]}
+      ${sconsFlags[@]}
+      ${buildFlags[@]} ${buildFlagsArray[@]}
     )
 
     echoCmd 'build flags' "${flagsArray[@]}"
@@ -33,8 +33,8 @@ sconsInstallPhase() {
     fi
 
     local flagsArray=(
-        $sconsFlags ${sconsFlagsArray[@]}
-        $installFlags ${installFlagsArray[@]}
+        ${sconsFlags[@]}
+        ${installFlags[@]} ${installFlagsArray[@]}
         ${installTargets:-install}
     )
 
@@ -60,7 +60,7 @@ sconsCheckPhase() {
     else
         local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
-            $sconsFlags ${sconsFlagsArray[@]}
+            ${sconsFlags[@]}
             ${checkFlagsArray[@]}
         )
 

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
@@ -33,10 +33,9 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  sconsFlags = "target=release_debug platform=x11";
-  preConfigure = ''
-    sconsFlags+=" ${lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)}"
-  '';
+  sconsFlags = [
+    "target=release_debug" "platform=x11"
+  ] ++ (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options);
 
   outputs = [ "out" "dev" "man" ];
 

diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   ];
 
   preBuild = ''
-    sconsFlagsArray+=("PATH=$PATH")
+    sconsFlags+=("PATH=$PATH")
   '';
 
   prefixKey = "PREFIX=";

diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix
@@ -19,11 +19,13 @@ stdenv.mkDerivation rec {
     sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g";
   };
 
-  patches = [ ./header-order.patch ./public-buildproject.patch
+  patches = [
+    ./header-order.patch
+    ./public-buildproject.patch
     (fetchpatch {
-	  url = https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw;
-	  sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
-	})
+      url = https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw;
+      sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
+    })
   ];
 
   postPatch = ''
@@ -35,11 +37,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
   buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ];
 
-  postConfigure = ''
-    sconsFlags+=" BINDIR=$out/bin"
-    sconsFlags+=" INSTALLDIR=$out/share/globulation2"
-    sconsFlags+=" DATADIR=$out/share/globulation2/glob2"
-  '';
+  sconsFlags = [
+    "BINDIR=${placeholder "out"}/bin"
+    "INSTALLDIR=${placeholder "out"}/share/globulation2"
+    "DATADIR=${placeholder "out"}/share/globulation2/glob2"
+  ];
 
   env.NIX_LDFLAGS = "-lboost_system";
 
@@ -49,5 +51,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl3;
   };
+
   passthru.updateInfo.downloadPage = "http://globulation2.org/wiki/Download_and_Install";
 }
diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL2 lua fftwFloat zlib bzip2 ];
 
-  sconsFlags = "--tool=";
+  sconsFlags = [ "--tool=" ];
 
   installPhase = ''
     install -Dm 755 build/powder* "$out/bin/powder"

diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix
@@ -16,7 +16,12 @@ stdenv.mkDerivation {
     zlib SDL lua5_1
   ];
 
-  sconsFlags = "OPENGL=false GTK=false CREATE_AVI=false LOGO=false";
+  sconsFlags = [
+    "OPENGL=false"
+    "GTK=false"
+    "CREATE_AVI=false"
+    "LOGO=false"
+  ];
   prefixKey = "--prefix=";
 
   # sed allows scons to find libraries in nix.

diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix
@@ -51,16 +51,15 @@ stdenv.mkDerivation rec {
   preBuild = ''
     patchShebangs .
     sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct
-
-    sconsFlags+=" udevdir=$out/lib/udev"
-    sconsFlags+=" python_libdir=$out/lib/${python2Packages.python.libPrefix}/site-packages"
   '';
 
   sconsFlags = [
     "leapfetch=no"
     "gpsd_user=${gpsdUser}"
     "gpsd_group=${gpsdGroup}"
     "systemd=yes"
+    "udevdir=${placeholder "out"}/lib/udev"
+    "python_libdir=${placeholder "out"}/lib/${python2Packages.python.libPrefix}/site-packages"
   ];
 
   preCheck = ''

diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -86,10 +86,9 @@ in stdenv.mkDerivation rec {
   ] ++ map (lib: "--use-system-${lib}") system-libraries;
 
   preBuild = ''
-    sconsFlags+=" CC=$CC"
-    sconsFlags+=" CXX=$CXX"
+    sconsFlags+=("CC=$CC" "CXX=$CXX")
   '' + optionalString stdenv.isAarch64 ''
-    sconsFlags+=" CCFLAGS='-march=armv8-a+crc'"
+    sconsFlags+=("CCFLAGS='-march=armv8-a+crc'")
   '';
 
   preInstall = ''

diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix
@@ -34,7 +34,11 @@ in stdenv.mkDerivation {
     export LIBPATH="${galeraLibs}/lib"
   '';
 
-  sconsFlags = "ssl=1 system_asio=1 strict_build_flags=0";
+  sconsFlags = [
+    "ssl=1"
+    "system_asio=1"
+    "strict_build_flags=0"
+  ];
 
   enableParallelBuilding = true;