diff --git a/foundation/flake.nix b/foundation/flake.nix index abe9dc7..73a35ae 100644 --- a/foundation/flake.nix +++ b/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 = diff --git a/foundation/src/stages/stage0/kaem/default.nix b/foundation/src/stages/stage0/kaem/default.nix index acd1105..7f5273c 100644 --- a/foundation/src/stages/stage0/kaem/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/mescc-tools-extra/default.nix b/foundation/src/stages/stage0/mescc-tools-extra/default.nix index 253be54..9f03450 100644 --- a/foundation/src/stages/stage0/mescc-tools-extra/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/mescc-tools/default.nix b/foundation/src/stages/stage0/mescc-tools/default.nix index ce15baa..387e9e8 100644 --- a/foundation/src/stages/stage0/mescc-tools/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase00.nix b/foundation/src/stages/stage0/phases/phase00.nix index 7ce452d..30bea76 100644 --- a/foundation/src/stages/stage0/phases/phase00.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase01.nix b/foundation/src/stages/stage0/phases/phase01.nix index 28a856c..cf974f5 100644 --- a/foundation/src/stages/stage0/phases/phase01.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase02.nix b/foundation/src/stages/stage0/phases/phase02.nix index fb3f1b2..56df68c 100644 --- a/foundation/src/stages/stage0/phases/phase02.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase03.nix b/foundation/src/stages/stage0/phases/phase03.nix index f446684..8263709 100644 --- a/foundation/src/stages/stage0/phases/phase03.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase04.nix b/foundation/src/stages/stage0/phases/phase04.nix index 53da830..a31a779 100644 --- a/foundation/src/stages/stage0/phases/phase04.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase05.nix b/foundation/src/stages/stage0/phases/phase05.nix index fe4e046..de19729 100644 --- a/foundation/src/stages/stage0/phases/phase05.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase06.nix b/foundation/src/stages/stage0/phases/phase06.nix index a5dee9f..146174a 100644 --- a/foundation/src/stages/stage0/phases/phase06.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase07.nix b/foundation/src/stages/stage0/phases/phase07.nix index 7829828..80565e8 100644 --- a/foundation/src/stages/stage0/phases/phase07.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase08.nix b/foundation/src/stages/stage0/phases/phase08.nix index 0656675..3f5b4b3 100644 --- a/foundation/src/stages/stage0/phases/phase08.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase09.nix b/foundation/src/stages/stage0/phases/phase09.nix index c3fe96d..a7473d2 100644 --- a/foundation/src/stages/stage0/phases/phase09.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase10.nix b/foundation/src/stages/stage0/phases/phase10.nix index 67dac35..59a59b5 100644 --- a/foundation/src/stages/stage0/phases/phase10.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase11.nix b/foundation/src/stages/stage0/phases/phase11.nix index 8873ae0..e458dc2 100644 --- a/foundation/src/stages/stage0/phases/phase11.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage0/phases/phase12.nix b/foundation/src/stages/stage0/phases/phase12.nix index c7634a7..5e0438d 100644 --- a/foundation/src/stages/stage0/phases/phase12.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/bash/boot.nix b/foundation/src/stages/stage1/bash/boot.nix index d5c7035..0a9df49 100644 --- a/foundation/src/stages/stage1/bash/boot.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/bash/default.nix b/foundation/src/stages/stage1/bash/default.nix index 2e0b319..832d21f 100644 --- a/foundation/src/stages/stage1/bash/default.nix +++ b/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 { diff --git a/foundation/src/stages/stage1/binutils/default.nix b/foundation/src/stages/stage1/binutils/default.nix index cbe9333..d5f83d5 100644 --- a/foundation/src/stages/stage1/binutils/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/bison/default.nix b/foundation/src/stages/stage1/bison/default.nix index 711f85e..22a75ad 100644 --- a/foundation/src/stages/stage1/bison/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/bzip2/default.nix b/foundation/src/stages/stage1/bzip2/default.nix index 5435bcb..f994d9d 100644 --- a/foundation/src/stages/stage1/bzip2/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/coreutils/default.nix b/foundation/src/stages/stage1/coreutils/default.nix index a3390e7..019c4e4 100644 --- a/foundation/src/stages/stage1/coreutils/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/diffutils/default.nix b/foundation/src/stages/stage1/diffutils/default.nix index c3903ea..55312c7 100644 --- a/foundation/src/stages/stage1/diffutils/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/findutils/default.nix b/foundation/src/stages/stage1/findutils/default.nix index 30eb797..9161555 100644 --- a/foundation/src/stages/stage1/findutils/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/gawk/default.nix b/foundation/src/stages/stage1/gawk/default.nix index 0ac0583..35149ba 100644 --- a/foundation/src/stages/stage1/gawk/default.nix +++ b/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 { diff --git a/foundation/src/stages/stage1/gcc/default.nix b/foundation/src/stages/stage1/gcc/default.nix index 93f91d9..f4e24c9 100644 --- a/foundation/src/stages/stage1/gcc/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/gnugrep/default.nix b/foundation/src/stages/stage1/gnugrep/default.nix index f5150fb..9cfb6ae 100644 --- a/foundation/src/stages/stage1/gnugrep/default.nix +++ b/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 { diff --git a/foundation/src/stages/stage1/gnum4/default.nix b/foundation/src/stages/stage1/gnum4/default.nix index 35482a7..613866e 100644 --- a/foundation/src/stages/stage1/gnum4/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/gnumake/default.nix b/foundation/src/stages/stage1/gnumake/default.nix index 94b018b..fea1ac3 100644 --- a/foundation/src/stages/stage1/gnumake/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/gnupatch/default.nix b/foundation/src/stages/stage1/gnupatch/default.nix index af02e78..5b8ab46 100644 --- a/foundation/src/stages/stage1/gnupatch/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/gnused/default.nix b/foundation/src/stages/stage1/gnused/default.nix index 3c4418f..4e6ae9c 100644 --- a/foundation/src/stages/stage1/gnused/default.nix +++ b/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 { diff --git a/foundation/src/stages/stage1/gnutar/default.nix b/foundation/src/stages/stage1/gnutar/default.nix index ba25738..49aa968 100644 --- a/foundation/src/stages/stage1/gnutar/default.nix +++ b/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 { diff --git a/foundation/src/stages/stage1/gzip/default.nix b/foundation/src/stages/stage1/gzip/default.nix index a59b251..c79a64b 100644 --- a/foundation/src/stages/stage1/gzip/default.nix +++ b/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 = - let - in - builders.bash.boot.build { - name = "gzip-${cfg.version}"; - meta = cfg.meta; + package = builders.bash.boot.build { + name = "gzip-${cfg.version}"; + meta = cfg.meta; - deps.build.host = [ - stage1.tinycc.mes.compiler.package - stage1.gnumake.boot.package - stage1.gnused.boot.package - stage1.gnugrep.package - ]; + deps.build.host = [ + stage1.tinycc.mes.compiler.package + stage1.gnumake.boot.package + stage1.gnused.boot.package + stage1.gnugrep.package + ]; - script = '' - # Unpack - ungz --file ${cfg.src} --output gzip.tar - untar --file gzip.tar - rm gzip.tar - cd gzip-${cfg.version} + script = '' + # Unpack + ungz --file ${cfg.src} --output gzip.tar + untar --file gzip.tar + rm gzip.tar + cd gzip-${cfg.version} - # Configure - export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib -Dstrlwr=unused" - bash ./configure --prefix=$out + # Configure + export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib -Dstrlwr=unused" + chmod +x ./configure + ./configure --prefix=$out - # Build - make + # Build + make - # Install - mkdir $out - make install - ''; - }; + # Install + mkdir $out + make install + ''; + }; }; }; } diff --git a/foundation/src/stages/stage1/heirloom/default.nix b/foundation/src/stages/stage1/heirloom/default.nix index 63f79cf..db978e1 100644 --- a/foundation/src/stages/stage1/heirloom/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/heirloom/devtools.nix b/foundation/src/stages/stage1/heirloom/devtools.nix index 87b9243..1102b6e 100644 --- a/foundation/src/stages/stage1/heirloom/devtools.nix +++ b/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" + ]; }; }; }; diff --git a/foundation/src/stages/stage1/linux-headers/default.nix b/foundation/src/stages/stage1/linux-headers/default.nix index c999611..2230e6b 100644 --- a/foundation/src/stages/stage1/linux-headers/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/ln-boot/default.nix b/foundation/src/stages/stage1/ln-boot/default.nix index 7b98c20..ead6b6e 100644 --- a/foundation/src/stages/stage1/ln-boot/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/mes/compiler.nix b/foundation/src/stages/stage1/mes/compiler.nix index e45e0e2..abd3cba 100644 --- a/foundation/src/stages/stage1/mes/compiler.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/mes/libc.nix b/foundation/src/stages/stage1/mes/libc.nix index 97a07de..141cabc 100644 --- a/foundation/src/stages/stage1/mes/libc.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/mes/libs.nix b/foundation/src/stages/stage1/mes/libs.nix index aa75bd7..959d684 100644 --- a/foundation/src/stages/stage1/mes/libs.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/musl/boot.nix b/foundation/src/stages/stage1/musl/boot.nix index 4b1e2fa..9c1b8c7 100644 --- a/foundation/src/stages/stage1/musl/boot.nix +++ b/foundation/src/stages/stage1/musl/boot.nix @@ -131,7 +131,6 @@ in # Install make install cp ${stage1.tinycc.mes.libs.package}/lib/libtcc1.a $out/lib - ''; }; }; diff --git a/foundation/src/stages/stage1/musl/default.nix b/foundation/src/stages/stage1/musl/default.nix index 89e245e..592c7a7 100644 --- a/foundation/src/stages/stage1/musl/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/nyacc/default.nix b/foundation/src/stages/stage1/nyacc/default.nix index 799b361..dc71ef3 100644 --- a/foundation/src/stages/stage1/nyacc/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/python/default.nix b/foundation/src/stages/stage1/python/default.nix index f730cb5..36a1902 100644 --- a/foundation/src/stages/stage1/python/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/tinycc/boot.nix b/foundation/src/stages/stage1/tinycc/boot.nix index 9e139e4..ff9948f 100644 --- a/foundation/src/stages/stage1/tinycc/boot.nix +++ b/foundation/src/stages/stage1/tinycc/boot.nix @@ -38,6 +38,7 @@ in default.value = [ "x86_64-linux" "i686-linux" + "x86-64_linux" ]; }; }; diff --git a/foundation/src/stages/stage1/tinycc/default.nix b/foundation/src/stages/stage1/tinycc/default.nix index b599aab..493a3cc 100644 --- a/foundation/src/stages/stage1/tinycc/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/xz/default.nix b/foundation/src/stages/stage1/xz/default.nix index 867f600..5259fd0 100644 --- a/foundation/src/stages/stage1/xz/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage1/zlib/default.nix b/foundation/src/stages/stage1/zlib/default.nix index ba9e018..d3f314d 100644 --- a/foundation/src/stages/stage1/zlib/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/bash/default.nix b/foundation/src/stages/stage2/bash/default.nix index ebdada0..b66d5d3 100644 --- a/foundation/src/stages/stage2/bash/default.nix +++ b/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 { diff --git a/foundation/src/stages/stage2/binutils/default.nix b/foundation/src/stages/stage2/binutils/default.nix index 31af117..013842d 100644 --- a/foundation/src/stages/stage2/binutils/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/busybox/default.nix b/foundation/src/stages/stage2/busybox/default.nix index 8d50e48..4732296 100644 --- a/foundation/src/stages/stage2/busybox/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/bzip2/default.nix b/foundation/src/stages/stage2/bzip2/default.nix index e503604..b5ab1e9 100644 --- a/foundation/src/stages/stage2/bzip2/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/coreutils/default.nix b/foundation/src/stages/stage2/coreutils/default.nix index 734fbcc..0d21bd6 100644 --- a/foundation/src/stages/stage2/coreutils/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/diffutils/default.nix b/foundation/src/stages/stage2/diffutils/default.nix index 92d193b..bf6a8d6 100644 --- a/foundation/src/stages/stage2/diffutils/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/findutils/default.nix b/foundation/src/stages/stage2/findutils/default.nix index 2ee6280..5a2fdf8 100644 --- a/foundation/src/stages/stage2/findutils/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/gawk/default.nix b/foundation/src/stages/stage2/gawk/default.nix index 1a85835..2a4f46d 100644 --- a/foundation/src/stages/stage2/gawk/default.nix +++ b/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 { diff --git a/foundation/src/stages/stage2/gcc/default.nix b/foundation/src/stages/stage2/gcc/default.nix index 8e9b7da..e80b989 100644 --- a/foundation/src/stages/stage2/gcc/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/glibc/default.nix b/foundation/src/stages/stage2/glibc/default.nix index 9167d48..7db5ae8 100644 --- a/foundation/src/stages/stage2/glibc/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/gnugrep/default.nix b/foundation/src/stages/stage2/gnugrep/default.nix index b304cd6..183d5dc 100644 --- a/foundation/src/stages/stage2/gnugrep/default.nix +++ b/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 { diff --git a/foundation/src/stages/stage2/gnumake/default.nix b/foundation/src/stages/stage2/gnumake/default.nix index cee3398..384a94d 100644 --- a/foundation/src/stages/stage2/gnumake/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/gnupatch/default.nix b/foundation/src/stages/stage2/gnupatch/default.nix index 12519d4..dca9677 100644 --- a/foundation/src/stages/stage2/gnupatch/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/gnused/default.nix b/foundation/src/stages/stage2/gnused/default.nix index d4a9942..f23b834 100644 --- a/foundation/src/stages/stage2/gnused/default.nix +++ b/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 { diff --git a/foundation/src/stages/stage2/gnutar/default.nix b/foundation/src/stages/stage2/gnutar/default.nix index 2423b09..c2f4d86 100644 --- a/foundation/src/stages/stage2/gnutar/default.nix +++ b/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 { diff --git a/foundation/src/stages/stage2/gzip/default.nix b/foundation/src/stages/stage2/gzip/default.nix index dc9316a..e6f230e 100644 --- a/foundation/src/stages/stage2/gzip/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/stages/stage2/patchelf/default.nix b/foundation/src/stages/stage2/patchelf/default.nix index 01868cb..fef5bb2 100644 --- a/foundation/src/stages/stage2/patchelf/default.nix +++ b/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" + ]; }; }; diff --git a/foundation/src/system/default.nix b/foundation/src/system/default.nix index d30880c..bb4d039 100644 --- a/foundation/src/system/default.nix +++ b/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.