WIP: feat: support for x86_64-linux #1

Draft
isabelroses wants to merge 3 commits from feat/x86-64_linux into main
73 changed files with 388 additions and 161 deletions

View file

@ -14,7 +14,10 @@
modules = import ./src;
forEachSystem = lib.attrs.generate [ "i686-linux" ];
forEachSystem = lib.attrs.generate [
"i686-linux"
"x86_64-linux"
isabelroses marked this conversation as resolved Outdated

Pretty much all of the packages from stage1 and beyond are restricted to i686-linux. I don't think that adding the extra system here will do much unless we modify packages to build properly on x86_64-linux and set their meta.platforms to include the new system.

Pretty much all of the packages from `stage1` and beyond are restricted to `i686-linux`. I don't think that adding the extra system here will do much unless we modify packages to build properly on `x86_64-linux` and set their `meta.platforms` to include the new system.
];
in
{
extras =

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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} \

View file

@ -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

View file

@ -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} \

View file

@ -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"
];
};
};

View file

@ -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"

View file

@ -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}

View file

@ -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}

View file

@ -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 \

View file

@ -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}

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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 {

View file

@ -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} \

View file

@ -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}

View file

@ -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"
];
};
};

View file

@ -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 {

View file

@ -34,43 +34,44 @@ in
sha256 = "02m6gajm647n8l9a5bnld6fnbgdpyi4i3i83p7xcwv0kif47xhy6";
};
package =
let
in
builders.bash.boot.build {
name = "gnutar-boot-${cfg.version}";
package = builders.bash.boot.build {
name = "gnutar-boot-${cfg.version}";
meta = stage1.gnutar.meta;
meta = stage1.gnutar.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 tar.tar
untar --file tar.tar
rm tar.tar
cd tar-${cfg.version}
script = ''
# Unpack
ungz --file ${cfg.src} --output tar.tar
untar --file tar.tar
rm tar.tar
cd tar-${cfg.version}
# Configure
export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
bash ./configure \
--build=${platform.build} \
--host=${platform.host} \
--disable-nls \
--prefix=$out
# Fix source permissions
chmod -R +r .
chmod +x ./configure
# Build
make AR="tcc -ar"
# Configure
export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
./configure \
--build=${platform.build} \
--host=${platform.host} \
--disable-nls \
--prefix=$out
# Install
make install
'';
};
# Build
make AR="tcc -ar"
# Install
make install
'';
};
};
};
}

View file

@ -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} \

View file

@ -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} \

View file

@ -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
'';
};
};
};
}

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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
'';
};
};

View file

@ -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} \

View file

@ -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"
];
};
};

View file

@ -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}

View file

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

View file

@ -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"
];
};
};

View file

@ -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} \

View file

@ -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

View file

@ -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} \

View file

@ -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

View file

@ -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"
];
};
};

View file

@ -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"
];
};
};

View file

@ -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

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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} \

View file

@ -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.