gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell.compiler.*: locales are required for build not host (#441459)

Browse Source
This commit is contained in:
Wolfgang Walther
2025-09-10 15:01:49 +00:00
committed by GitHub
parent b85d83724d e7627649cd
commit 677eada98b
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/common-hadrian.nix
+2 -3
View File
@@ -36,7 +36,6 @@
libiconv ? null,
ncurses,
glibcLocales ? null,
# GHC can be built with system libffi or a bundled one.
libffi ? null,
@@ -549,8 +548,8 @@ stdenv.mkDerivation (
"${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
}"
''
+ lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") ''
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
+ lib.optionalString (stdenv.buildPlatform.libc == "glibc") ''
export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive"
''
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
pkgs/development/compilers/ghc/common-make-native-bignum.nix
+2 -3
View File
@@ -29,7 +29,6 @@
libiconv ? null,
ncurses,
glibcLocales ? null,
# GHC can be built with system libffi or a bundled one.
libffi ? null,
@@ -436,8 +435,8 @@ stdenv.mkDerivation (
echo -n "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
''
+ lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") ''
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
+ lib.optionalString (stdenv.buildPlatform.libc == "glibc") ''
export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive"
''
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"