Compare commits

..

1 commit

Author SHA1 Message Date
Steve D a2f0a06426 Fix non-deterministic "missing: Permission denied" errors (#4)
Make 'missing' executable where source tarballs use autotools and are unpacked with untar.  untar doesn't preserve or set mtime, which may result in autotools generated files, e.g. configure, having newer timestamps than their source files (e.g. configure.in.) In these circumstances autotools generated Makefiles will call 'missing' to either regenerate them or fix-up the timestamps.

Reviewed-on: auxolotl/labs#4
Reviewed-by: isabel roses <isabel@isabelroses.com>
Reviewed-by: Jake Hamilton <jake.hamilton@hey.com>
Co-authored-by: Steve Dodd <steved424@gmail.com>
Co-committed-by: Steve Dodd <steved424@gmail.com>
2024-06-23 17:32:11 +00:00
73 changed files with 164 additions and 388 deletions

View file

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

View file

@ -34,10 +34,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -42,10 +42,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -125,10 +125,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -41,10 +41,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -33,10 +33,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -34,10 +34,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -35,10 +35,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -35,10 +35,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -36,10 +36,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -37,10 +37,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -38,10 +38,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -39,10 +39,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -40,10 +40,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -41,10 +41,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -40,10 +40,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -40,10 +40,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -31,10 +31,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -34,10 +34,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
mainProgram = lib.options.create { mainProgram = lib.options.create {
@ -109,8 +106,7 @@ 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
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -133,8 +130,7 @@ 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"
chmod +x ./configure bash ./configure ${builtins.concatStringsSep " " configureFlags}
./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

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -89,8 +86,7 @@ in
cd bison-${cfg.version} cd bison-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -33,10 +33,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -34,10 +34,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -101,8 +98,7 @@ 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
chmod +x ./configure bash ./configure ${builtins.concatStringsSep " " configureFlags}
./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"

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -90,8 +87,7 @@ 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
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} --host=${platform.host}

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -95,8 +92,7 @@ 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
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} --host=${platform.host}

View file

@ -68,8 +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
chmod +x ./configure chmod 0755 missing
./configure \ bash ./configure \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \
--disable-nls \ --disable-nls \

View file

@ -34,10 +34,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
mainProgram = lib.options.create { mainProgram = lib.options.create {
@ -96,8 +93,7 @@ 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
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} --host=${platform.host}

View file

@ -38,10 +38,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -200,8 +197,7 @@ 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"
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -162,8 +162,7 @@ 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"
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -163,8 +163,7 @@ 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
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -167,8 +167,7 @@ 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"
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -31,10 +31,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
mainProgram = lib.options.create { mainProgram = lib.options.create {

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -88,8 +85,7 @@ in
cd m4-${cfg.version} cd m4-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -34,10 +34,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -104,8 +101,7 @@ 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
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} --host=${platform.host}

View file

@ -31,10 +31,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -34,10 +34,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
mainProgram = lib.options.create { mainProgram = lib.options.create {

View file

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

View file

@ -37,10 +37,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
mainProgram = lib.options.create { mainProgram = lib.options.create {
@ -98,8 +95,7 @@ in
cd tar-${cfg.version} cd tar-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -59,8 +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
chmod +x ./configure chmod 0755 missing
./configure \ bash ./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -31,10 +31,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -63,37 +60,39 @@ in
sha256 = "0ryr5b00qz3xcdcv03qwjdfji8pasp0007ay3ppmk71wl8c1i90w"; sha256 = "0ryr5b00qz3xcdcv03qwjdfji8pasp0007ay3ppmk71wl8c1i90w";
}; };
package = builders.bash.boot.build { package =
name = "gzip-${cfg.version}"; let
meta = cfg.meta; in
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"
chmod +x ./configure bash ./configure --prefix=$out
./configure --prefix=$out
# Build # Build
make make
# Install # Install
mkdir $out mkdir $out
make install make install
''; '';
}; };
}; };
}; };
} }

View file

@ -45,10 +45,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -53,10 +53,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
}; };

View file

@ -26,10 +26,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -33,10 +33,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -31,10 +31,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -33,10 +33,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -118,8 +118,7 @@ in
src/misc/wordexp.c src/misc/wordexp.c
# Configure # Configure
chmod +x configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \
@ -132,6 +131,7 @@ 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
''; '';
}; };
}; };

View file

@ -35,10 +35,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -98,8 +95,7 @@ in
src/misc/wordexp.c src/misc/wordexp.c
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -34,10 +34,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -107,8 +104,7 @@ 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"
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} --host=${platform.host}

View file

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

View file

@ -37,10 +37,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -35,10 +35,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -91,8 +88,7 @@ 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
chmod +x configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -86,8 +83,7 @@ in
# Configure # Configure
export CC=musl-gcc export CC=musl-gcc
chmod +x configure bash ./configure --prefix=$out
./configure --prefix=$out
# Build # Build
make -j $NIX_BUILD_CORES make -j $NIX_BUILD_CORES

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
mainProgram = lib.options.create { mainProgram = lib.options.create {
@ -97,8 +94,7 @@ in
cd bash-${cfg.version} cd bash-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -123,8 +120,7 @@ in
${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches} ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
# Configure # Configure
chmod +x ./configure bash ./configure ${builtins.concatStringsSep " " configureFlags}
./configure ${builtins.concatStringsSep " " configureFlags}
# Build # Build
make -j $NIX_BUILD_CORES make -j $NIX_BUILD_CORES

View file

@ -33,10 +33,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -33,10 +33,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -102,8 +99,7 @@ in
cd coreutils-${cfg.version} cd coreutils-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure ${builtins.concatStringsSep " " configureFlags}
./configure ${builtins.concatStringsSep " " configureFlags}
# Build # Build
make -j $NIX_BUILD_CORES make -j $NIX_BUILD_CORES

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -89,8 +86,7 @@ in
cd diffutils-${cfg.version} cd diffutils-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -89,8 +86,7 @@ in
cd findutils-${cfg.version} cd findutils-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
mainProgram = lib.options.create { mainProgram = lib.options.create {
@ -95,8 +92,7 @@ in
cd gawk-${cfg.version} cd gawk-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -194,8 +191,7 @@ 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"
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -33,10 +33,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -94,8 +91,7 @@ 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
chmod +x ../configure bash ../configure \
../configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
mainProgram = lib.options.create { mainProgram = lib.options.create {
@ -94,8 +91,7 @@ in
cd grep-${cfg.version} cd grep-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -33,10 +33,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -105,8 +102,7 @@ in
${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches} ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -90,8 +87,7 @@ in
cd patch-${cfg.version} cd patch-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
mainProgram = lib.options.create { mainProgram = lib.options.create {
@ -96,8 +93,7 @@ in
cd sed-${cfg.version} cd sed-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
mainProgram = lib.options.create { mainProgram = lib.options.create {
@ -95,8 +92,7 @@ in
cd tar-${cfg.version} cd tar-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -32,10 +32,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -88,8 +85,7 @@ in
cd gzip-${cfg.version} cd gzip-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -33,10 +33,7 @@ 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 = [ default.value = [ "i686-linux" ];
"i686-linux"
"x86_64-linux"
];
}; };
}; };
@ -89,8 +86,7 @@ in
cd patchelf-${cfg.version} cd patchelf-${cfg.version}
# Configure # Configure
chmod +x ./configure bash ./configure \
./configure \
--prefix=$out \ --prefix=$out \
--build=${platform.build} \ --build=${platform.build} \
--host=${platform.host} \ --host=${platform.host} \

View file

@ -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 = "x86_64-linux"; default.value = "i686-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.