WIP: enable __structuredAttrs in stdenv.mkDerivation

This is an attempt at adding support for `__structuredAttrs`.

pkgs/stdenv/generic/builder.sh

@@ -1,3 +1,5 @@
+source .attrs.sh
+
 export PATH=
 for i in $initialPath; do
     if [ "$i" = / ]; then i=; fi

pkgs/stdenv/generic/default-builder.sh

@@ -1,2 +1,3 @@
+source .attrs.sh
 source $stdenv/setup
 genericBuild

pkgs/stdenv/generic/default.nix

@@ -79,6 +79,7 @@ let
       builder = shell;
 
       args = ["-e" ./builder.sh];
+      __structuredAttrs = true;
 
       setup = setupScript;
 

pkgs/stdenv/generic/make-derivation.nix

@@ -199,6 +199,7 @@ in rec {
           builder = attrs.realBuilder or stdenv.shell;
           args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
           inherit stdenv;
+          __structuredAttrs = true;
 
           # The `system` attribute of a derivation has special meaning to Nix.
           # Derivations set it to choose what sort of machine could be used to

pkgs/stdenv/linux/bootstrap-tools/default.nix

@@ -3,11 +3,12 @@
 derivation {
   name = "bootstrap-tools";
 
-  builder = bootstrapFiles.busybox;
+  builder = "${bootstrapFiles.busybox}";
 
   args = [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];
 
   tarball = bootstrapFiles.bootstrapTools;
+#   __structuredAttrs = true;
 
   inherit system;
 

pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh

@@ -1,5 +1,6 @@
 # Unpack the bootstrap tools tarball.
 echo Unpacking the bootstrap tools...
+# . ./.attrs.sh
 $builder mkdir $out
 < $tarball $builder unxz | $builder tar x -C $out
 

pkgs/stdenv/linux/make-bootstrap-tools.nix

@@ -217,6 +217,7 @@ in with pkgs; rec {
     inherit (stdenv.hostPlatform) system; # We cannot "cross test"
     builder = bootstrapFiles.busybox;
     args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ];
+    __structuredAttrs = true;
 
     buildCommand = ''
       export PATH=${bootstrapTools}/bin