Merge branch 'nixos-native-fix-gettext' into 'master'

nix: native: Enforce autopoint in gettext and downgrade file

See merge request redox-os/redox!2289
This commit is contained in:
Jeremy Soller 2026-08-06 09:14:45 -06:00
commit 1327cd80ca
2 changed files with 15 additions and 6 deletions

View File

@ -116,7 +116,16 @@
cmake
curl
doxygen
file
(file.overrideAttrs (attrs: {
version = "5.46";
src = fetchurl {
urls = [
"https://astron.com/pub/file/file-5.46.tar.gz"
"https://distfiles.macports.org/file/file-5.46.tar.gz"
];
hash = "sha256-ycx3x8VgxUMTXtxVWvYJ1WGdvvARmX6YjOQKPXXYYIg=";
};
}))
flex
gettext
gnumake

View File

@ -9,12 +9,12 @@ patches = [
script = """
DYNAMIC_INIT
GNU_CONFIG_GET build-aux/config.sub
( cd gettext-runtime/libasprintf && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
( cd gettext-runtime/intl && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
( cd gettext-runtime && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
( cd gettext-tools && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
( cd gettext-runtime/libasprintf && AUTOPOINT=true autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
( cd gettext-runtime/intl && AUTOPOINT=true autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
( cd gettext-runtime && AUTOPOINT=true autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
( cd gettext-tools && AUTOPOINT=true autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
( cd libtextstyle && autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal )
autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal
AUTOPOINT=true autoreconf -fvi -I${COOKBOOK_HOST_SYSROOT}/share/aclocal
"""
[build]