fix: don't use bash to call the builds allow them to infer from the shebang

foundation/flake.nix

@@ -14,7 +14,10 @@
 
       modules = import ./src;
 
-      forEachSystem = lib.attrs.generate [ "i686-linux" ];
+      forEachSystem = lib.attrs.generate [
+        "i686-linux"
+        "x86_64-linux"
+      ];
     in
     {
       extras =

foundation/src/stages/stage0/kaem/default.nix

@@ -34,7 +34,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/mescc-tools-extra/default.nix

@@ -42,7 +42,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/mescc-tools/default.nix

@@ -125,7 +125,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase00.nix

@@ -41,7 +41,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase01.nix

@@ -33,7 +33,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase02.nix

@@ -34,7 +34,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase03.nix

@@ -35,7 +35,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase04.nix

@@ -35,7 +35,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase05.nix

@@ -36,7 +36,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase06.nix

@@ -37,7 +37,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase07.nix

@@ -38,7 +38,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase08.nix

@@ -39,7 +39,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase09.nix

@@ -40,7 +40,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase10.nix

@@ -41,7 +41,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase11.nix

@@ -40,7 +40,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage0/phases/phase12.nix

@@ -40,7 +40,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/bash/boot.nix

@@ -31,7 +31,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/bash/default.nix

@@ -34,7 +34,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {
@@ -106,7 +109,8 @@ in
             export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
             export AR="tcc -ar"
             export LD=tcc
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host} \

foundation/src/stages/stage1/binutils/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -130,7 +133,8 @@ in
             export AR="tcc -ar"
             export lt_cv_sys_max_cmd_len=32768
             export CFLAGS="-D__LITTLE_ENDIAN__=1"
-            bash ./configure ${builtins.concatStringsSep " " configureFlags}
+            chmod +x ./configure
+            ./configure ${builtins.concatStringsSep " " configureFlags}
 
             # Build
             make -j $NIX_BUILD_CORES all-libiberty all-gas all-bfd all-libctf all-zlib all-gprof

foundation/src/stages/stage1/bison/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -86,7 +89,8 @@ in
           cd bison-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage1/bzip2/default.nix

@@ -33,7 +33,10 @@ in
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
         # TODO: Support more platforms.
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/coreutils/default.nix

@@ -34,7 +34,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -98,7 +101,8 @@ in
             # Configure
             export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
             export LD=tcc
-            bash ./configure ${builtins.concatStringsSep " " configureFlags}
+            chmod +x ./configure
+            ./configure ${builtins.concatStringsSep " " configureFlags}
 
             # Build
             make -j $NIX_BUILD_CORES AR="tcc -ar" MAKEINFO="true"

foundation/src/stages/stage1/diffutils/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -87,7 +90,8 @@ in
           # Configure
           export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
           export LD=tcc
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host}

foundation/src/stages/stage1/findutils/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -92,7 +95,8 @@ in
           export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
           export AR="tcc -ar"
           export LD=tcc
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host}

foundation/src/stages/stage1/gawk/boot.nix

@@ -68,7 +68,8 @@ in
             export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
             export ac_cv_func_getpgrp_void=yes
             export ac_cv_func_tzset=yes
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
               --build=${platform.build} \
               --host=${platform.host} \
               --disable-nls \

foundation/src/stages/stage1/gawk/default.nix

@@ -34,7 +34,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {
@@ -93,7 +96,8 @@ in
           export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
           export AR="tcc -ar"
           export LD=tcc
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host}

foundation/src/stages/stage1/gcc/default.nix

@@ -38,7 +38,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -197,7 +200,8 @@ in
           export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so"
           export LIBRARY_PATH="${stage1.musl.package}/lib"
 
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage1/gcc/v4.6.cxx.nix

@@ -162,7 +162,8 @@ in
             export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
             export LIBRARY_PATH="${stage1.musl.package}/lib"
 
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host} \

foundation/src/stages/stage1/gcc/v4.6.nix

@@ -163,7 +163,8 @@ in
             export ac_cv_func_memcpy=yes
             export ac_cv_func_strerror=yes
 
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host} \

foundation/src/stages/stage1/gcc/v8.nix

@@ -167,7 +167,8 @@ in
           export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
           export LIBRARY_PATH="${stage1.musl.package}/lib"
 
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage1/gnugrep/default.nix

@@ -31,7 +31,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage1/gnum4/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -85,7 +88,8 @@ in
           cd m4-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage1/gnumake/default.nix

@@ -34,7 +34,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -101,7 +104,8 @@ in
             # Configure
             export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
             export LD=tcc
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host}

foundation/src/stages/stage1/gnupatch/default.nix

@@ -31,7 +31,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/gnused/default.nix

@@ -34,7 +34,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage1/gnutar/boot.nix

@@ -34,43 +34,41 @@ in
         sha256 = "02m6gajm647n8l9a5bnld6fnbgdpyi4i3i83p7xcwv0kif47xhy6";
       };
 
-      package =
+      package = builders.bash.boot.build {
-        let
+        name = "gnutar-boot-${cfg.version}";
-        in
-        builders.bash.boot.build {
-          name = "gnutar-boot-${cfg.version}";
 
-          meta = stage1.gnutar.meta;
+        meta = stage1.gnutar.meta;
 
-          deps.build.host = [
+        deps.build.host = [
-            stage1.tinycc.mes.compiler.package
+          stage1.tinycc.mes.compiler.package
-            stage1.gnumake.boot.package
+          stage1.gnumake.boot.package
-            stage1.gnused.boot.package
+          stage1.gnused.boot.package
-            stage1.gnugrep.package
+          stage1.gnugrep.package
-          ];
+        ];
 
-          script = ''
+        script = ''
-            # Unpack
+          # Unpack
-            ungz --file ${cfg.src} --output tar.tar
+          ungz --file ${cfg.src} --output tar.tar
-            untar --file tar.tar
+          untar --file tar.tar
-            rm tar.tar
+          rm tar.tar
-            cd tar-${cfg.version}
+          cd tar-${cfg.version}
 
-            # Configure
+          # Configure
-            export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
+          export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
-            bash ./configure \
+          chmod +x ./configure
-              --build=${platform.build} \
+          ./configure \
-              --host=${platform.host} \
+            --build=${platform.build} \
-              --disable-nls \
+            --host=${platform.host} \
-              --prefix=$out
+            --disable-nls \
+            --prefix=$out
 
-            # Build
+          # Build
-            make AR="tcc -ar"
+          make AR="tcc -ar"
 
-            # Install
+          # Install
-            make install
+          make install
-          '';
+        '';
-        };
+      };
     };
   };
 }

foundation/src/stages/stage1/gnutar/default.nix

@@ -37,7 +37,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {
@@ -95,7 +98,8 @@ in
           cd tar-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage1/gnutar/musl.nix

@@ -59,7 +59,8 @@ in
           export ac_cv_sizeof_unsigned_long=4
           export ac_cv_sizeof_long_long=8
           export ac_cv_header_netdb_h=no
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage1/gzip/default.nix

@@ -31,7 +31,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -60,39 +63,37 @@ in
         sha256 = "0ryr5b00qz3xcdcv03qwjdfji8pasp0007ay3ppmk71wl8c1i90w";
       };
 
-      package =
+      package = builders.bash.boot.build {
-        let
+        name = "gzip-${cfg.version}";
-        in
+        meta = cfg.meta;
-        builders.bash.boot.build {
-          name = "gzip-${cfg.version}";
-          meta = cfg.meta;
 
-          deps.build.host = [
+        deps.build.host = [
-            stage1.tinycc.mes.compiler.package
+          stage1.tinycc.mes.compiler.package
-            stage1.gnumake.boot.package
+          stage1.gnumake.boot.package
-            stage1.gnused.boot.package
+          stage1.gnused.boot.package
-            stage1.gnugrep.package
+          stage1.gnugrep.package
-          ];
+        ];
 
-          script = ''
+        script = ''
-            # Unpack
+          # Unpack
-            ungz --file ${cfg.src} --output gzip.tar
+          ungz --file ${cfg.src} --output gzip.tar
-            untar --file gzip.tar
+          untar --file gzip.tar
-            rm gzip.tar
+          rm gzip.tar
-            cd gzip-${cfg.version}
+          cd gzip-${cfg.version}
 
-            # Configure
+          # Configure
-            export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib -Dstrlwr=unused"
+          export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib -Dstrlwr=unused"
-            bash ./configure --prefix=$out
+          chmod +x ./configure
+          ./configure --prefix=$out
 
-            # Build
+          # Build
-            make
+          make
 
-            # Install
+          # Install
-            mkdir $out
+          mkdir $out
-            make install
+          make install
-          '';
+        '';
-        };
+      };
     };
   };
 }

foundation/src/stages/stage1/heirloom/default.nix

@@ -45,7 +45,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/heirloom/devtools.nix

@@ -53,7 +53,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
   };

foundation/src/stages/stage1/linux-headers/default.nix

@@ -26,7 +26,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/ln-boot/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/mes/compiler.nix

@@ -33,7 +33,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/mes/libc.nix

@@ -31,7 +31,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/mes/libs.nix

@@ -33,7 +33,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/musl/boot.nix

@@ -118,7 +118,8 @@ in
               src/misc/wordexp.c
 
             # Configure
-            bash ./configure \
+            chmod +x configure
+            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host} \
@@ -131,7 +132,6 @@ in
             # Install
             make install
             cp ${stage1.tinycc.mes.libs.package}/lib/libtcc1.a $out/lib
-
           '';
         };
     };

foundation/src/stages/stage1/musl/default.nix

@@ -35,7 +35,10 @@ in
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
         # TODO: Support more platforms.
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -95,7 +98,8 @@ in
             src/misc/wordexp.c
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage1/nyacc/default.nix

@@ -34,7 +34,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/python/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -104,7 +107,8 @@ in
             export C_INCLUDE_PATH="${stage1.zlib.package}/include"
             export LIBRARY_PATH="${stage1.zlib.package}/lib"
             export LD_LIBRARY_PATH="$LIBRARY_PATH"
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host}

foundation/src/stages/stage1/tinycc/boot.nix

@@ -38,6 +38,7 @@ in
         default.value = [
           "x86_64-linux"
           "i686-linux"
+          "x86_64-linux"
         ];
       };
     };

foundation/src/stages/stage1/tinycc/default.nix

@@ -37,7 +37,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/xz/default.nix

@@ -35,7 +35,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -88,7 +91,8 @@ in
           export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
           export AR="tcc -ar"
           export LD=tcc
-          bash ./configure \
+          chmod +x configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage1/zlib/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -83,7 +86,8 @@ in
 
           # Configure
           export CC=musl-gcc
-          bash ./configure --prefix=$out
+          chmod +x configure
+          ./configure --prefix=$out
 
           # Build
           make -j $NIX_BUILD_CORES

foundation/src/stages/stage2/bash/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {
@@ -94,7 +97,8 @@ in
           cd bash-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage2/binutils/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -120,7 +123,8 @@ in
             ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
 
             # Configure
-            bash ./configure ${builtins.concatStringsSep " " configureFlags}
+            chmod +x ./configure
+            ./configure ${builtins.concatStringsSep " " configureFlags}
 
             # Build
             make -j $NIX_BUILD_CORES

foundation/src/stages/stage2/busybox/default.nix

@@ -33,7 +33,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/bzip2/default.nix

@@ -33,7 +33,10 @@ in
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
         # TODO: Support more platforms.
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/coreutils/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -99,7 +102,8 @@ in
             cd coreutils-${cfg.version}
 
             # Configure
-            bash ./configure ${builtins.concatStringsSep " " configureFlags}
+            chmod +x ./configure
+            ./configure ${builtins.concatStringsSep " " configureFlags}
 
             # Build
             make -j $NIX_BUILD_CORES

foundation/src/stages/stage2/diffutils/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -86,7 +89,8 @@ in
           cd diffutils-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage2/findutils/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -86,7 +89,8 @@ in
           cd findutils-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage2/gawk/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {
@@ -92,7 +95,8 @@ in
           cd gawk-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage2/gcc/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -191,7 +194,8 @@ in
           export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so"
           export LIBRARY_PATH="${stage1.musl.package}/lib"
 
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage2/glibc/default.nix

@@ -33,7 +33,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -91,7 +94,8 @@ in
           cd build
           # libstdc++.so is built against musl and fails to link
           export CXX=false
-          bash ../configure \
+          chmod +x ../configure
+          ../configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage2/gnugrep/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {
@@ -91,7 +94,8 @@ in
           cd grep-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage2/gnumake/default.nix

@@ -33,7 +33,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -102,7 +105,8 @@ in
             ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
 
             # Configure
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host} \

foundation/src/stages/stage2/gnupatch/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -87,7 +90,8 @@ in
           cd patch-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage2/gnused/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {
@@ -93,7 +96,8 @@ in
           cd sed-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage2/gnutar/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {
@@ -92,7 +95,8 @@ in
           cd tar-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage2/gzip/default.nix

@@ -32,7 +32,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -85,7 +88,8 @@ in
           cd gzip-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage2/patchelf/default.nix

@@ -33,7 +33,10 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [ "i686-linux" ];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -86,7 +89,8 @@ in
           cd patchelf-${cfg.version}
 
           # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/system/default.nix

@@ -3,7 +3,7 @@
   options.aux = {
     system = lib.options.create {
       type = lib.types.string;
-      default.value = "i686-linux";
+      default.value = "x86_64-linux";
       description = ''
         The system to build packages for. This value can be provided as either
         `config.aux.system` or by setting the `system` argument for modules.