treewide: load structured attributes in all bash builders consistently

It's hard to put the sourcing of ./.attrs.sh into all builder
consistently - mistakes will happen. Thus, load structured attrs once in
make-derivation and then source the remaining builder on top.

This should fix quite a few builders with structured attributes in
principle. Most importantly it helps substitute / substituteAll, which
are required for bootstrap on some platforms.

pkgs/applications/audio/pianoteq/default.nix

@@ -111,8 +111,6 @@ let
     stdenv.mkDerivation {
       inherit name;
       builder = writeShellScript "builder.sh" ''
-        source $stdenv/setup
-
         curlVersion=$(${curl}/bin/curl -V | head -1 | cut -d' ' -f2)
 
         # Curl flags to handle redirects, not use EPSV, handle cookies for

pkgs/applications/emulators/wine/builder-wow.sh

@@ -1,6 +1,4 @@
 ## build described at https://wiki.winehq.org/Building_Wine#Shared_WoW64
-
-source $stdenv/setup
 preFlags="${configureFlags}"
 
 unpackPhase

pkgs/applications/misc/adobe-reader/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 echo "unpacking $src..."
 tar xvfa $src
 

pkgs/build-support/docker/default.nix

@@ -970,7 +970,6 @@ rec {
             mkdir $out
             ${if enableFakechroot then ''
               proot -r $PWD/old_out ${bind-paths} --pwd=/ fakeroot bash -c '
-                source $stdenv/setup
                 eval "$fakeRootCommands"
                 tar \
                   --sort name \
@@ -983,7 +982,6 @@ rec {
               '
             '' else ''
               fakeroot bash -c '
-                source $stdenv/setup
                 cd old_out
                 eval "$fakeRootCommands"
                 tar \

pkgs/build-support/fetchbzr/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source "$stdenv/setup"
-
 echo "exporting \`$url' (revision $rev) into \`$out'"
 
 # Perform a lightweight checkout so that we don't end up importing

pkgs/build-support/fetchcvs/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 (echo "#!$SHELL"; \
  echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh
 chmod +x ssh

pkgs/build-support/fetchdarcs/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 tagtext=""
 tagflags=""
 # Darcs hashes are sha1 (120 bits, 40-character hex)

pkgs/build-support/fetchdocker/fetchdocker-builder.sh

@@ -1,5 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source "${stdenv}/setup"
 echo "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}"
 mkdir -p "${out}"
 

pkgs/build-support/fetchdocker/generic-fetcher.nix

@@ -35,7 +35,6 @@ in
 stdenv.mkDerivation {
   inherit name;
   builder = writeText "${fetcher}-builder.sh" ''
-    source "$stdenv/setup"
     echo "${fetcher} exporting to $out"
 
     declare -A creds

pkgs/build-support/fetchfirefoxaddon/default.nix

@@ -33,8 +33,6 @@ stdenv.mkDerivation {
   };
 
   builder = writeScript "xpibuilder" ''
-    source $stdenv/setup
-
     echo "firefox addon $name into $out"
 
     UUID="${extid}"

pkgs/build-support/fetchfossil/builder.sh

@@ -1,5 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
 echo "Cloning Fossil $url [$rev] into $out"
 
 # Fossil, bless its adorable little heart, wants to write global configuration

pkgs/build-support/fetchgit/builder.sh

@@ -3,8 +3,6 @@
 # - revision specified and remote has a HEAD
 # - revision specified and remote without HEAD
 #
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
 
 echo "exporting $url (rev $rev) into $out"
 

pkgs/build-support/fetchhg/builder.sh

@@ -1,5 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
 echo "getting $url${rev:+ ($rev)} into $out"
 
 hg clone --insecure "$url" hg-clone

pkgs/build-support/fetchipfs/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 # Curl flags to handle redirects, not use EPSV, handle cookies for
 # servers to need them during redirects, and work on SSL without a
 # certificate (this isn't a security problem because we check the

pkgs/build-support/fetchmtn/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 set -x
 
 if ! [ -f "$cacheDB" ]; then

pkgs/build-support/fetchsvn/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 echo "exporting $url (r$rev) into $out"
 
 if test -n "$http_proxy"; then

pkgs/build-support/fetchsvnssh/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 echo "exporting $url (r$rev) into $out"
 
 if test "$sshSupport"; then

pkgs/build-support/fetchurl/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 source $mirrorsFile
 
 curlVersion=$(curl -V | head -1 | cut -d' ' -f2)

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

@@ -1,4 +1,2 @@
-source $stdenv/setup
-
 # !!! this is kinda hacky.
 set | grep -E '^[a-zA-Z]+=.*://' > $out

pkgs/build-support/kernel/make-initrd.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 set -o pipefail
 
 objects=($objects)

pkgs/build-support/kernel/modules-closure.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 # When no modules are built, the $out/lib/modules directory will not
 # exist. Because the rest of the script assumes it does exist, we
 # handle this special case first.

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

@@ -5,7 +5,6 @@ args:
 stdenv.mkDerivation ({
   name = if args ? name then args.name else baseNameOf (toString args.src);
   builder = builtins.toFile "builder.sh" ''
-    source $stdenv/setup
     set -o pipefail
 
     eval "$preInstall"

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

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 eval "$preInstall"
 
 args=

pkgs/build-support/substitute/substitute.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 args=
 
 target=$out

pkgs/by-name/bo/boot/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 boot_bin=$out/bin/boot
 
 mkdir -pv $(dirname $boot_bin)

pkgs/by-name/in/invidious/videojs.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 unpackPhase
 cd source
 # this helper downloads the videojs files and checks their checksums

pkgs/by-name/k2/k2pdfopt/package.nix

@@ -46,7 +46,6 @@
 let
   # Create a patch against src based on changes applied in patchCommands
   mkPatch = { name, src, patchCommands }: runCommand "${name}-k2pdfopt.patch" { inherit src; } ''
-    source $stdenv/setup
     unpackPhase
 
     orig=$sourceRoot

pkgs/by-name/wt/wtk/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 mkdir unzipped
 pushd unzipped
 unzip $src || true

pkgs/by-name/xo/xorg_sys_opengl/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 mkdir -p $out/lib
 
 ln -s /usr/lib/libGL.so.1 $out/lib/

pkgs/by-name/xq/xquartz/system-fonts.nix

@@ -6,8 +6,6 @@ stdenv.mkDerivation {
     xorg.mkfontdir xorg.mkfontscale
   ];
   buildCommand = ''
-    source $stdenv/setup
-
     for i in ${toString fontDirs} ; do
       if [ -d $i/ ]; then
         list="$list $i";

pkgs/by-name/ya/yandex-disk/package.nix

@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
   };
 
   builder = writeText "builder.sh" ''
-    . $stdenv/setup
     mkdir -pv $out/bin
     mkdir -pv $out/share
     mkdir -pv $out/etc

pkgs/development/bower-modules/generic/default.nix

@@ -18,8 +18,6 @@ in pkgs.stdenv.mkDerivation (
     inherit bowerPackages;
 
     builder = builtins.toFile "builder.sh" ''
-      source $stdenv/setup
-
       # The project's bower.json is required
       cp $src/bower.json .
 

pkgs/development/compilers/chicken/4/fetchegg/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 echo "exporting egg ${eggName} (version $version) into $out"
 
 mkdir -p $out

pkgs/development/compilers/fpc/binary-builder-darwin.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 pkgdir=$(pwd)/pkg
 deploydir=$(pwd)/deploy
 

pkgs/development/compilers/fpc/binary-builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 tar xf $src
 cd */
 tarballdir=$(pwd)

pkgs/development/compilers/fpc/remove-signature.sh

@@ -1,3 +1 @@
-source $stdenv/setup
-
 codesign_allocate -r -i "$1" -o "$1"

pkgs/development/compilers/ios-cross-compile/9.2_builder.sh

@@ -1,6 +1,4 @@
 # -*- shell-script -*-
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
 
 function extract
 {

pkgs/development/libraries/glibc/locales-builder.sh

@@ -1,9 +1,6 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
 # Glibc cannot have itself in its RPATH.
 export NIX_NO_SELF_RPATH=1
 
-source $stdenv/setup
-
 postConfigure() {
     # Hack: get rid of the `-static' flag set by the bootstrap stdenv.
     # This has to be done *after* `configure' because it builds some

pkgs/development/libraries/gtk-sharp/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 genericBuild
 
 # !!! hack

pkgs/development/perl-modules/generic/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl"
 
 perlFlags=

pkgs/development/tools/misc/automake/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 # Wrap the given `aclocal' program, appending extra `-I' flags
 # corresponding to the directories listed in $ACLOCAL_PATH.  (Note
 # that `wrapProgram' can't be used for that purpose since it can only

pkgs/os-specific/linux/nvidia-x11/builder.sh

@@ -1,6 +1,3 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
-source $stdenv/setup
-
 unpackManually() {
     skip=$(sed 's/^skip=//; t; d' $src)
     tail -n +$skip $src | bsdtar xvf -

pkgs/servers/x11/xorg/builder.sh

@@ -1,7 +1,4 @@
-if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
 # This is the builder for all X.org components.
-source $stdenv/setup
-
 
 # After installation, automatically add all "Requires" fields in the
 # pkgconfig files (*.pc) to the propagated build inputs.

pkgs/stdenv/generic/default-builder.sh

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

pkgs/stdenv/generic/make-derivation.nix

@@ -361,7 +361,7 @@ else let
         );
     }) // {
       builder = attrs.realBuilder or stdenv.shell;
-      args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
+      args = attrs.args or ["-e" ./source-stdenv.sh (attrs.builder or ./default-builder.sh)];
       inherit stdenv;
 
       # The `system` attribute of a derivation has special meaning to Nix.

pkgs/stdenv/generic/source-stdenv.sh

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

pkgs/tools/typesetting/tex/nix/animatedot.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 mkdir -p $out
 
 for ((i = 1; i <= $nrFrames; i++)); do

pkgs/tools/typesetting/tex/nix/dot2pdf.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 mkdir -p $out
 
 dot2pdf() {

pkgs/tools/typesetting/tex/nix/dot2ps.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 mkdir -p $out
 
 dot2ps() {

pkgs/tools/typesetting/tex/nix/lhs2tex.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 mkdir -p $out
 
 mkdir root

pkgs/tools/typesetting/tex/nix/run-latex.sh

@@ -1,5 +1,3 @@
-source $stdenv/setup
-
 mkdir -p $out
 
 export VARTEXFONTS=$TMPDIR/texfonts