NixOS · Nov 4, 2019 · Nov 4, 2019
diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     makeWrapper ninja ant perl
   ];
 
-  ninjaFlags = "-C build/Opt";
+  ninjaFlags = [ "-C build/Opt" ];
 
   postInstall = ''
     for i in "$out"/bin/*; do

diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
@@ -259,7 +259,7 @@ stdenv.mkDerivation {
   # TODO: investigate the non-working tests
   checkPhase = ''
     checkTarget=check-swift-all
-    ninjaFlags='-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}'
+    ninjaFlags=('-C buildbot_linux/swift-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}')
 
     ninjaCheckPhase
   '';

diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -31,7 +31,7 @@ cmakeConfigurePhase() {
     fi
 
     if [ -z "${dontAddPrefix-}" ]; then
-        cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix $cmakeFlags"
+        cmakeFlags=("-DCMAKE_INSTALL_PREFIX=$prefix" ${cmakeFlags[@]+"${cmakeFlags[@]}"})
     fi
 
     # We should set the proper `CMAKE_SYSTEM_NAME`.
@@ -40,72 +40,76 @@ cmakeConfigurePhase() {
     # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and
     # strip. Otherwise they are taken to be relative to the source root of the
     # package being built.
-    cmakeFlags="-DCMAKE_CXX_COMPILER=$CXX $cmakeFlags"
-    cmakeFlags="-DCMAKE_C_COMPILER=$CC $cmakeFlags"
-    cmakeFlags="-DCMAKE_AR=$(command -v $AR) $cmakeFlags"
-    cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLIB) $cmakeFlags"
-    cmakeFlags="-DCMAKE_STRIP=$(command -v $STRIP) $cmakeFlags"
-
-    # on macOS we want to prefer Unix-style headers to Frameworks
-    # because we usually do not package the framework
-    cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags"
-
-    # we never want to use the global macOS SDK
-    cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags"
-
-    # disable OSX deployment target
-    # we don't want our binaries to have a "minimum" OSX version
-    cmakeFlags="-DCMAKE_OSX_DEPLOYMENT_TARGET= $cmakeFlags"
-
-    # correctly detect our clang compiler
-    cmakeFlags="-DCMAKE_POLICY_DEFAULT_CMP0025=NEW $cmakeFlags"
-
-    # This installs shared libraries with a fully-specified install
-    # name. By default, cmake installs shared libraries with just the
-    # basename as the install name, which means that, on Darwin, they
-    # can only be found by an executable at runtime if the shared
-    # libraries are in a system path or in the same directory as the
-    # executable. This flag makes the shared library accessible from its
-    # nix/store directory.
-    cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib $cmakeFlags"
-
-    # This ensures correct paths with multiple output derivations
-    # It requires the project to use variables from GNUInstallDirs module
-    # https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
-    cmakeFlags="-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName} $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale $cmakeFlags"
+    cmakeFlags=(
+        "-DCMAKE_CXX_COMPILER=$CXX"
+        "-DCMAKE_C_COMPILER=$CC"
+        "-DCMAKE_AR=$(command -v $AR)"
+        "-DCMAKE_RANLIB=$(command -v $RANLIB)"
+        "-DCMAKE_STRIP=$(command -v $STRIP)"
+
+        # on macOS we want to prefer Unix-style headers to Frameworks
+        # because we usually do not package the framework
+        "-DCMAKE_FIND_FRAMEWORK=last"
+
+        # we never want to use the global macOS SDK
+        "-DCMAKE_OSX_SYSROOT="
+
+        # disable OSX deployment target
+        # we don't want our binaries to have a "minimum" OSX version
+        "-DCMAKE_OSX_DEPLOYMENT_TARGET="
+
+        # correctly detect our clang compiler
+        "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
+
+        # This installs shared libraries with a fully-specified install
+        # name. By default, cmake installs shared libraries with just the
+        # basename as the install name, which means that, on Darwin, they
+        # can only be found by an executable at runtime if the shared
+        # libraries are in a system path or in the same directory as the
+        # executable. This flag makes the shared library accessible from its
+        # nix/store directory.
+        "-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib"
+
+        # This ensures correct paths with multiple output derivations
+        # It requires the project to use variables from GNUInstallDirs module
+        # https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
+        "-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin"
+        "-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin"
+        "-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
+        "-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include"
+        "-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man"
+        "-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info"
+        "-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName}"
+        "-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib"
+        "-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec"
+        "-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
+
+        # Avoid cmake resetting the rpath of binaries, on make install
+        # And build always Release, to ensure optimisation flags
+        "-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON"
+
+        # Disable user package registry to avoid potential side effects
+        # and unecessary attempts to access non-existent home folder
+        # https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry
+        "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
+        "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
+        "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON"
+
+        ${cmakeFlags[@]+"${cmakeFlags[@]}"}
+        ${cmakeFlagsArray[@]+"${cmakeFlagsArray[@]}"}
+    )
 
     # Don’t build tests when doCheck = false
     if [ -z "${doCheck-}" ]; then
-        cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags"
+        cmakeFlags=("-DBUILD_TESTING=OFF" "${cmakeFlags[@]}")
     fi
-
-    # Avoid cmake resetting the rpath of binaries, on make install
-    # And build always Release, to ensure optimisation flags
-    cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags"
-
-    # Disable user package registry to avoid potential side effects
-    # and unecessary attempts to access non-existent home folder
-    # https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry
-    cmakeFlags="-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON $cmakeFlags"
-    cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON $cmakeFlags"
-    cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON $cmakeFlags"
-
     if [ "${buildPhase-}" = ninjaBuildPhase ]; then
-        cmakeFlags="-GNinja $cmakeFlags"
+        cmakeFlags=("-GNinja" "${cmakeFlags[@]}")
     fi
 
-    echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"
+    echo "cmake flags: ${cmakeFlags[@]}"
 
-    cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}"
+    cmake ${cmakeDir:-.} "${cmakeFlags[@]}"
 
     if ! [[ -v enableParallelBuilding ]]; then
         enableParallelBuilding=1

diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/development/tools/build-managers/ninja/setup-hook.sh
@@ -10,7 +10,7 @@ ninjaBuildPhase() {
 
     local flagsArray=(
         -j$buildCores -l$NIX_BUILD_CORES
-        $ninjaFlags "${ninjaFlagsArray[@]}"
+        ${ninjaFlags[@]+"${ninjaFlags[@]}"}
     )
 
     echoCmd 'build flags' "${flagsArray[@]}"
@@ -28,8 +28,8 @@ ninjaInstallPhase() {
 
     # shellcheck disable=SC2086
     local flagsArray=(
-        $ninjaFlags "${ninjaFlagsArray[@]}"
-        ${installTargets:-install}
+        ${ninjaFlags[@]+"${ninjaFlags[@]}"}
+        "${installTargets[@]-install}"
     )
 
     echoCmd 'install flags' "${flagsArray[@]}"
@@ -62,7 +62,7 @@ ninjaCheckPhase() {
 
         local flagsArray=(
             -j$buildCores -l$NIX_BUILD_CORES
-            $ninjaFlags "${ninjaFlagsArray[@]}"
+            ${ninjaFlags[@]+"${ninjaFlags[@]}"}
             $checkTarget
         )