From 28f966f9e0a4fc025ffce96d37f00f5cf33f7a5d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 6 Jan 2024 21:03:44 +0100 Subject: [PATCH] stdenv: rebuild gettext with working iconv --- pkgs/stdenv/linux/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index b8111f34e30a..e5a225f15838 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -385,6 +385,9 @@ in configureFlags = (a.configureFlags or []) ++ [ "--with-native-system-header-dir=/include" "--with-build-sysroot=${lib.getDev self.stdenv.cc.libc}" + # Don't assume that `gettext` was built with iconv support, since we don't have + # our own `glibc` yet. + "--disable-nls" ]; # This is a separate phase because gcc assembles its phase scripts @@ -507,7 +510,7 @@ in overrides = self: super: rec { inherit (prevStage) ccWrapperStdenv - binutils coreutils gnugrep gettext + binutils coreutils gnugrep perl patchelf linuxHeaders gnum4 bison libidn2 libunistring libxcrypt; # We build a special copy of libgmp which doesn't use libstdc++, because # xgcc++'s libstdc++ references the bootstrap-files (which is what