stdenv and base packages: fix with __structuredAttrs enabled

pkgs/build-support/add-opengl-runpath/default.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "add-opengl-runpath";
 
-  driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32";
+  env.driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32";
 
   buildCommand = ''
     mkdir -p $out/nix-support

pkgs/build-support/buildenv/builder.pl

@@ -13,10 +13,15 @@
 $SIG{__WARN__} = sub { warn "warning: ", @_ };
 $SIG{__DIE__}  = sub { die "error: ", @_ };
 
-my $out = $ENV{"out"};
-my $extraPrefix = $ENV{"extraPrefix"};
+open my $fh, '<', '.attrs.json' or die "Can't open file $!";
+my $attrsJson = do { local $/; <$fh> };
+close $fh;
 
-my @pathsToLink = split ' ', $ENV{"pathsToLink"};
+my $nixAttrs = decode_json($attrsJson);
+my $out = $nixAttrs->{outputs}->{out};
+my $extraPrefix = $nixAttrs->{extraPrefix};
+
+my @pathsToLink = @{$nixAttrs->{pathsToLink}};
 
 sub isInPathsToLink {
     my $path = shift;
@@ -218,24 +223,13 @@ sub addPkg {
     }
 }
 
-# Read packages list.
-my $pkgs;
-
-if (exists $ENV{"pkgsPath"}) {
-    open FILE, $ENV{"pkgsPath"};
-    $pkgs = <FILE>;
-    close FILE;
-} else {
-    $pkgs = $ENV{"pkgs"}
-}
-
 # Symlink to the packages that have been installed explicitly by the
 # user.
-for my $pkg (@{decode_json $pkgs}) {
+for my $pkg (@{$nixAttrs->{pkgs}}) {
     for my $path (@{$pkg->{paths}}) {
         addPkg($path,
-               $ENV{"ignoreCollisions"} eq "1",
-               $ENV{"checkCollisionContents"} eq "1",
+               $nixAttrs->{ignoreCollisions},
+               $nixAttrs->{checkCollisionContents},
                $pkg->{priority})
            if -e $path;
     }
@@ -251,7 +245,7 @@ sub addPkg {
     my @pkgDirs = keys %postponed;
     %postponed = ();
     foreach my $pkgDir (sort @pkgDirs) {
-        addPkg($pkgDir, 2, $ENV{"checkCollisionContents"} eq "1", $priorityCounter++);
+        addPkg($pkgDir, 2, $nixAttrs->{checkCollisionContents}, $priorityCounter++);
     }
 }
 
@@ -277,7 +271,7 @@ sub addPkg {
 print STDERR "created $nrLinks symlinks in user environment\n";
 
 
-my $manifest = $ENV{"manifest"};
+my $manifest = $nixAttrs->{manifest};
 if ($manifest) {
     symlink($manifest, "$out/manifest") or die "cannot create manifest";
 }

pkgs/build-support/buildenv/default.nix

@@ -51,11 +51,11 @@ let
 in
 
 runCommand name
-  rec {
+  {
     inherit manifest ignoreCollisions checkCollisionContents passthru
             meta pathsToLink extraPrefix postBuild
             nativeBuildInputs buildInputs;
-    pkgs = builtins.toJSON (map (drv: {
+    pkgs = map (drv: {
       paths =
         # First add the usual output(s): respect if user has chosen explicitly,
         # and otherwise use `meta.outputsToInstall`. The attribute is guaranteed
@@ -69,11 +69,10 @@ runCommand name
         ++ lib.filter (p: p!=null)
           (builtins.map (outName: drv.${outName} or null) extraOutputsToInstall);
       priority = drv.meta.priority or 5;
-    }) paths);
+    }) paths;
     preferLocalBuild = true;
     allowSubstitutes = false;
-    # XXX: The size is somewhat arbitrary
-    passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else [ ];
+    __structuredAttrs = true;
   }
   ''
     ${buildPackages.perl}/bin/perl -w ${builder}

pkgs/build-support/fetchurl/write-mirror-list.sh

@@ -1,3 +1,5 @@
+if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
+
 source $stdenv/setup
 
 # !!! this is kinda hacky.

pkgs/build-support/pkg-config-wrapper/default.nix

@@ -48,9 +48,6 @@ stdenv.mkDerivation {
   dontConfigure = true;
   dontUnpack = true;
 
-  # Additional flags passed to pkg-config.
-  addFlags = lib.optional stdenv.targetPlatform.isStatic "--static";
-
   installPhase =
     ''
       mkdir -p $out/bin $out/nix-support
@@ -116,6 +113,9 @@ stdenv.mkDerivation {
     shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or "";
     wrapperName = "PKG_CONFIG_WRAPPER";
     inherit targetPrefix suffixSalt baseBinName;
+
+    # Additional flags passed to pkg-config.
+    addFlags = lib.optionalString stdenv.targetPlatform.isStatic "--static";
   };
 
   meta =

pkgs/build-support/remove-references-to/default.nix

@@ -29,7 +29,9 @@ stdenv.mkDerivation {
     substituteAll ${./darwin-sign-fixup.sh} $out/nix-support/setup-hooks.sh
   '';
 
-  inherit (builtins) storeDir;
-  shell = lib.getBin shell + (shell.shellPath or "");
-  signingUtils = if darwinCodeSign then signingUtils else null;
+  env = {
+    inherit (builtins) storeDir;
+    shell = lib.getBin shell + (shell.shellPath or "");
+    signingUtils = lib.optionalString darwinCodeSign signingUtils;
+  };
 }

pkgs/build-support/setup-hooks/autoreconf.sh

@@ -2,6 +2,13 @@ preConfigurePhases="${preConfigurePhases:-} autoreconfPhase"
 
 autoreconfPhase() {
     runHook preAutoreconf
-    autoreconf ${autoreconfFlags:---install --force --verbose}
+
+    if [ -z "$__structuredAttrs" ]; then
+        autoreconfFlags=(${autoreconfFlags[*]})
+    fi
+
+    defaultFlags=(--install --force --verbose)
+    autoreconf "${autoreconfFlags[@]:-"${defaultFlags[@]}"}"
+
     runHook postAutoreconf
 }

pkgs/build-support/substitute/substitute-all.nix

@@ -1,12 +1,14 @@
 { stdenvNoCC }:
 
-args:
+args@{ postInstall ? "", preInstall ? "", meta ? {}, ... }:
 
 # see the substituteAll in the nixpkgs documentation for usage and constaints
-stdenvNoCC.mkDerivation ({
+stdenvNoCC.mkDerivation {
   name = if args ? name then args.name else baseNameOf (toString args.src);
   builder = ./substitute-all.sh;
   inherit (args) src;
   preferLocalBuild = true;
   allowSubstitutes = false;
-} // args)
+  env = removeAttrs args ["name" "src" "meta" "postInstall" "preInstall"];
+  inherit meta preInstall postInstall;
+}

pkgs/build-support/substitute/substitute-all.sh

@@ -1,3 +1,5 @@
+if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
+
 source $stdenv/setup
 
 eval "$preInstall"

pkgs/build-support/trivial-builders/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell }:
+{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell, jq }:
 
 let
   inherit (lib)
@@ -542,12 +542,13 @@ rec {
       args = removeAttrs args_ [ "name" "postBuild" ]
         // {
           inherit preferLocalBuild allowSubstitutes;
-          passAsFile = [ "paths" ];
+          __structuredAttrs = true;
         }; # pass the defaults
     in runCommand name args
       ''
         mkdir -p $out
-        for i in $(cat $pathsPath); do
+        ${jq}/bin/jq -r ".paths[]" < .attrs.json > paths
+        for i in $(cat paths); do
           ${lndir}/bin/lndir -silent $i $out
         done
         ${postBuild}
@@ -646,11 +647,7 @@ rec {
     }:
     script:
     runCommand name
-      (substitutions // {
-        # TODO(@Artturin:) substitutions should be inside the env attrset
-        # but users are likely passing non-substitution arguments through substitutions
-        # turn off __structuredAttrs to unbreak substituteAll
-        __structuredAttrs = false;
+      ({
         inherit meta;
         inherit depsTargetTargetPropagated;
         propagatedBuildInputs =
@@ -659,6 +656,7 @@ rec {
             (lib.warnIf (deps != [ ]) "'deps' argument to makeSetupHook is deprecated and will be removed in release 23.11., Please use propagatedBuildInputs instead. content of deps: ${toString deps}"
               propagatedBuildInputs ++ (if lib.isList deps then deps else [ deps ]));
         strictDeps = true;
+        env = substitutions;
         # TODO 2023-01, no backport: simplify to inherit passthru;
         passthru = passthru
           // optionalAttrs (substitutions?passthru)

pkgs/by-name/cm/cmake/setup-hook.sh

@@ -35,8 +35,12 @@ cmakeConfigurePhase() {
         : ${cmakeDir:=.}
     fi
 
+    if [ -z "$__structuredAttrs" ]; then
+        cmakeFlags=(${cmakeFlags[*]})
+    fi
+
     if [ -z "${dontAddPrefix-}" ]; then
-        cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix $cmakeFlags"
+        cmakeFlags=("-DCMAKE_INSTALL_PREFIX=$prefix" "${cmakeFlags[@]}")
     fi
 
     # We should set the proper `CMAKE_SYSTEM_NAME`.
@@ -45,21 +49,21 @@ 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"
+    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"
+    cmakeFlags=("-DCMAKE_FIND_FRAMEWORK=LAST" "${cmakeFlags[@]}")
 
     # we never want to use the global macOS SDK
-    cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags"
+    cmakeFlags=("-DCMAKE_OSX_SYSROOT=" "${cmakeFlags[@]}")
 
     # correctly detect our clang compiler
-    cmakeFlags="-DCMAKE_POLICY_DEFAULT_CMP0025=NEW $cmakeFlags"
+    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
@@ -68,7 +72,7 @@ cmakeConfigurePhase() {
     # 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"
+    cmakeFlags=("-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib" "${cmakeFlags[@]}")
 
     # The docdir flag needs to include PROJECT_NAME as per GNU guidelines,
     # try to extract it from CMakeLists.txt.
@@ -91,39 +95,41 @@ cmakeConfigurePhase() {
     # 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_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[@]}")
 
     # Don’t build tests when doCheck = false
     if [ -z "${doCheck-}" ]; then
-        cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags"
+        cmakeFlags=("-DBUILD_TESTING=OFF" "${cmakeFlags[@]}")
     fi
 
     # Always build Release, to ensure optimisation flags
-    cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} $cmakeFlags"
+    cmakeFlags=("-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release}" "${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_USE_PACKAGE_REGISTRY=OFF $cmakeFlags"
-    cmakeFlags="-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF $cmakeFlags"
+    cmakeFlags=("-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" "${cmakeFlags[@]}")
+    cmakeFlags=("-DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF" "${cmakeFlags[@]}")
+    cmakeFlags=("-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF" "${cmakeFlags[@]}")
 
     if [ "${buildPhase-}" = ninjaBuildPhase ]; then
-        cmakeFlags="-GNinja $cmakeFlags"
+        cmakeFlags=("-GNinja" "${cmakeFlags[@]}")
     fi
 
-    echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"
+    cmakeFlags=("${cmakeFlags[@]}" "${cmakeFlagsArray[@]}")
+
+    echo "cmake flags: ${cmakeFlags[@]}"
 
-    cmake "$cmakeDir" $cmakeFlags "${cmakeFlagsArray[@]}"
+    cmake "$cmakeDir" "${cmakeFlags[@]}"
 
     if ! [[ -v enableParallelBuilding ]]; then
         enableParallelBuilding=1

pkgs/development/compilers/gcc/common/extra-target-flags.nix

@@ -14,8 +14,8 @@ in
       ] ++ lib.optionals (! withoutTargetLibc) [
         "-B${lib.getLib dep}${dep.libdir or "/lib"}"
       ]);
-    in mkFlags libcCross langD
-       ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null) langD)
+    in toString (mkFlags libcCross langD
+       ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null) langD))
     ;
 
   EXTRA_LDFLAGS_FOR_TARGET = let
@@ -27,7 +27,7 @@ in
           "-Wl,-rpath,${lib.getLib dep}${dep.libdir or "/lib"}"
           "-Wl,-rpath-link,${lib.getLib dep}${dep.libdir or "/lib"}"
       ]));
-    in mkFlags libcCross
-       ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null))
+    in toString (mkFlags libcCross
+       ++ lib.optionals (!withoutTargetLibc) (mkFlags (threadsCross.package or null)))
     ;
 }