WIP: feat: support for x86_64-linux #1
|
@ -14,7 +14,10 @@
|
||||||
|
|
||||||
modules = import ./src;
|
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
|
|||||||
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
extras =
|
extras =
|
||||||
|
|
|
@ -34,7 +34,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -125,7 +125,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
mainProgram = lib.options.create {
|
mainProgram = lib.options.create {
|
||||||
|
@ -106,7 +109,8 @@ in
|
||||||
export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
||||||
export AR="tcc -ar"
|
export AR="tcc -ar"
|
||||||
export LD=tcc
|
export LD=tcc
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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 AR="tcc -ar"
|
||||||
export lt_cv_sys_max_cmd_len=32768
|
export lt_cv_sys_max_cmd_len=32768
|
||||||
export CFLAGS="-D__LITTLE_ENDIAN__=1"
|
export CFLAGS="-D__LITTLE_ENDIAN__=1"
|
||||||
bash ./configure ${builtins.concatStringsSep " " configureFlags}
|
chmod +x ./configure
|
||||||
|
./configure ${builtins.concatStringsSep " " configureFlags}
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
make -j $NIX_BUILD_CORES all-libiberty all-gas all-bfd all-libctf all-zlib all-gprof
|
make -j $NIX_BUILD_CORES all-libiberty all-gas all-bfd all-libctf all-zlib all-gprof
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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}
|
cd bison-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -33,7 +33,10 @@ in
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
# TODO: Support more platforms.
|
# TODO: Support more platforms.
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -98,7 +101,8 @@ in
|
||||||
# Configure
|
# Configure
|
||||||
export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
||||||
export LD=tcc
|
export LD=tcc
|
||||||
bash ./configure ${builtins.concatStringsSep " " configureFlags}
|
chmod +x ./configure
|
||||||
|
./configure ${builtins.concatStringsSep " " configureFlags}
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
make -j $NIX_BUILD_CORES AR="tcc -ar" MAKEINFO="true"
|
make -j $NIX_BUILD_CORES AR="tcc -ar" MAKEINFO="true"
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -87,7 +90,8 @@ in
|
||||||
# Configure
|
# Configure
|
||||||
export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
||||||
export LD=tcc
|
export LD=tcc
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host}
|
--host=${platform.host}
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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 CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
||||||
export AR="tcc -ar"
|
export AR="tcc -ar"
|
||||||
export LD=tcc
|
export LD=tcc
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host}
|
--host=${platform.host}
|
||||||
|
|
|
@ -68,7 +68,8 @@ in
|
||||||
export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
|
export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
|
||||||
export ac_cv_func_getpgrp_void=yes
|
export ac_cv_func_getpgrp_void=yes
|
||||||
export ac_cv_func_tzset=yes
|
export ac_cv_func_tzset=yes
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
--disable-nls \
|
--disable-nls \
|
||||||
|
|
|
@ -34,7 +34,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
mainProgram = lib.options.create {
|
mainProgram = lib.options.create {
|
||||||
|
@ -93,7 +96,8 @@ in
|
||||||
export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
||||||
export AR="tcc -ar"
|
export AR="tcc -ar"
|
||||||
export LD=tcc
|
export LD=tcc
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host}
|
--host=${platform.host}
|
||||||
|
|
|
@ -38,7 +38,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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 CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so"
|
||||||
export LIBRARY_PATH="${stage1.musl.package}/lib"
|
export LIBRARY_PATH="${stage1.musl.package}/lib"
|
||||||
|
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -162,7 +162,8 @@ in
|
||||||
export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
|
export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
|
||||||
export LIBRARY_PATH="${stage1.musl.package}/lib"
|
export LIBRARY_PATH="${stage1.musl.package}/lib"
|
||||||
|
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -163,7 +163,8 @@ in
|
||||||
export ac_cv_func_memcpy=yes
|
export ac_cv_func_memcpy=yes
|
||||||
export ac_cv_func_strerror=yes
|
export ac_cv_func_strerror=yes
|
||||||
|
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -167,7 +167,8 @@ in
|
||||||
export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
|
export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
|
||||||
export LIBRARY_PATH="${stage1.musl.package}/lib"
|
export LIBRARY_PATH="${stage1.musl.package}/lib"
|
||||||
|
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -31,7 +31,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
mainProgram = lib.options.create {
|
mainProgram = lib.options.create {
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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}
|
cd m4-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -34,7 +34,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -101,7 +104,8 @@ in
|
||||||
# Configure
|
# Configure
|
||||||
export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
||||||
export LD=tcc
|
export LD=tcc
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host}
|
--host=${platform.host}
|
||||||
|
|
|
@ -31,7 +31,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
mainProgram = lib.options.create {
|
mainProgram = lib.options.create {
|
||||||
|
|
|
@ -34,43 +34,44 @@ in
|
||||||
sha256 = "02m6gajm647n8l9a5bnld6fnbgdpyi4i3i83p7xcwv0kif47xhy6";
|
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
|
# Fix source permissions
|
||||||
export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
|
chmod -R +r .
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
--build=${platform.build} \
|
|
||||||
--host=${platform.host} \
|
|
||||||
--disable-nls \
|
|
||||||
--prefix=$out
|
|
||||||
|
|
||||||
# Build
|
# Configure
|
||||||
make AR="tcc -ar"
|
export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
|
||||||
|
./configure \
|
||||||
|
--build=${platform.build} \
|
||||||
|
--host=${platform.host} \
|
||||||
|
--disable-nls \
|
||||||
|
--prefix=$out
|
||||||
|
|
||||||
# Install
|
# Build
|
||||||
make install
|
make AR="tcc -ar"
|
||||||
'';
|
|
||||||
};
|
# Install
|
||||||
|
make install
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,7 +37,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
mainProgram = lib.options.create {
|
mainProgram = lib.options.create {
|
||||||
|
@ -95,7 +98,8 @@ in
|
||||||
cd tar-${cfg.version}
|
cd tar-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -59,7 +59,8 @@ in
|
||||||
export ac_cv_sizeof_unsigned_long=4
|
export ac_cv_sizeof_unsigned_long=4
|
||||||
export ac_cv_sizeof_long_long=8
|
export ac_cv_sizeof_long_long=8
|
||||||
export ac_cv_header_netdb_h=no
|
export ac_cv_header_netdb_h=no
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -31,7 +31,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -60,39 +63,37 @@ in
|
||||||
sha256 = "0ryr5b00qz3xcdcv03qwjdfji8pasp0007ay3ppmk71wl8c1i90w";
|
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
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -26,7 +26,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -118,7 +118,8 @@ in
|
||||||
src/misc/wordexp.c
|
src/misc/wordexp.c
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
@ -131,7 +132,6 @@ in
|
||||||
# Install
|
# Install
|
||||||
make install
|
make install
|
||||||
cp ${stage1.tinycc.mes.libs.package}/lib/libtcc1.a $out/lib
|
cp ${stage1.tinycc.mes.libs.package}/lib/libtcc1.a $out/lib
|
||||||
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -35,7 +35,10 @@ in
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
# TODO: Support more platforms.
|
# TODO: Support more platforms.
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -95,7 +98,8 @@ in
|
||||||
src/misc/wordexp.c
|
src/misc/wordexp.c
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -34,7 +34,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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 C_INCLUDE_PATH="${stage1.zlib.package}/include"
|
||||||
export LIBRARY_PATH="${stage1.zlib.package}/lib"
|
export LIBRARY_PATH="${stage1.zlib.package}/lib"
|
||||||
export LD_LIBRARY_PATH="$LIBRARY_PATH"
|
export LD_LIBRARY_PATH="$LIBRARY_PATH"
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host}
|
--host=${platform.host}
|
||||||
|
|
|
@ -38,6 +38,7 @@ in
|
||||||
default.value = [
|
default.value = [
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
"i686-linux"
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -37,7 +37,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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 CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
|
||||||
export AR="tcc -ar"
|
export AR="tcc -ar"
|
||||||
export LD=tcc
|
export LD=tcc
|
||||||
bash ./configure \
|
chmod +x configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -83,7 +86,8 @@ in
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
export CC=musl-gcc
|
export CC=musl-gcc
|
||||||
bash ./configure --prefix=$out
|
chmod +x configure
|
||||||
|
./configure --prefix=$out
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
make -j $NIX_BUILD_CORES
|
make -j $NIX_BUILD_CORES
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
mainProgram = lib.options.create {
|
mainProgram = lib.options.create {
|
||||||
|
@ -94,7 +97,8 @@ in
|
||||||
cd bash-${cfg.version}
|
cd bash-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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}
|
${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure ${builtins.concatStringsSep " " configureFlags}
|
chmod +x ./configure
|
||||||
|
./configure ${builtins.concatStringsSep " " configureFlags}
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
make -j $NIX_BUILD_CORES
|
make -j $NIX_BUILD_CORES
|
||||||
|
|
|
@ -33,7 +33,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,10 @@ in
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
# TODO: Support more platforms.
|
# TODO: Support more platforms.
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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}
|
cd coreutils-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure ${builtins.concatStringsSep " " configureFlags}
|
chmod +x ./configure
|
||||||
|
./configure ${builtins.concatStringsSep " " configureFlags}
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
make -j $NIX_BUILD_CORES
|
make -j $NIX_BUILD_CORES
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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}
|
cd diffutils-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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}
|
cd findutils-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
mainProgram = lib.options.create {
|
mainProgram = lib.options.create {
|
||||||
|
@ -92,7 +95,8 @@ in
|
||||||
cd gawk-${cfg.version}
|
cd gawk-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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 CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so"
|
||||||
export LIBRARY_PATH="${stage1.musl.package}/lib"
|
export LIBRARY_PATH="${stage1.musl.package}/lib"
|
||||||
|
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -33,7 +33,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -91,7 +94,8 @@ in
|
||||||
cd build
|
cd build
|
||||||
# libstdc++.so is built against musl and fails to link
|
# libstdc++.so is built against musl and fails to link
|
||||||
export CXX=false
|
export CXX=false
|
||||||
bash ../configure \
|
chmod +x ../configure
|
||||||
|
../configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
mainProgram = lib.options.create {
|
mainProgram = lib.options.create {
|
||||||
|
@ -91,7 +94,8 @@ in
|
||||||
cd grep-${cfg.version}
|
cd grep-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -33,7 +33,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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}
|
${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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}
|
cd patch-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
mainProgram = lib.options.create {
|
mainProgram = lib.options.create {
|
||||||
|
@ -93,7 +96,8 @@ in
|
||||||
cd sed-${cfg.version}
|
cd sed-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
description = "Platforms the package supports.";
|
||||||
default.value = [ "i686-linux" ];
|
default.value = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
mainProgram = lib.options.create {
|
mainProgram = lib.options.create {
|
||||||
|
@ -92,7 +95,8 @@ in
|
||||||
cd tar-${cfg.version}
|
cd tar-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -32,7 +32,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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}
|
cd gzip-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -33,7 +33,10 @@ in
|
||||||
platforms = lib.options.create {
|
platforms = lib.options.create {
|
||||||
type = lib.types.list.of lib.types.string;
|
type = lib.types.list.of lib.types.string;
|
||||||
description = "Platforms the package supports.";
|
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}
|
cd patchelf-${cfg.version}
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
bash ./configure \
|
chmod +x ./configure
|
||||||
|
./configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${platform.build} \
|
--build=${platform.build} \
|
||||||
--host=${platform.host} \
|
--host=${platform.host} \
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
options.aux = {
|
options.aux = {
|
||||||
system = lib.options.create {
|
system = lib.options.create {
|
||||||
type = lib.types.string;
|
type = lib.types.string;
|
||||||
default.value = "i686-linux";
|
default.value = "x86_64-linux";
|
||||||
description = ''
|
description = ''
|
||||||
The system to build packages for. This value can be provided as either
|
The system to build packages for. This value can be provided as either
|
||||||
`config.aux.system` or by setting the `system` argument for modules.
|
`config.aux.system` or by setting the `system` argument for modules.
|
||||||
|
|
Loading…
Reference in a new issue
Pretty much all of the packages from
stage1
and beyond are restricted toi686-linux
. I don't think that adding the extra system here will do much unless we modify packages to build properly onx86_64-linux
and set theirmeta.platforms
to include the new system.