pyrox.dev
haskell.compiler.*: locales are required for build not host (#441459)
authored by Wolfgang Walther and committed by GitHub 677eada9 b85d8372
+2
-3
pkgs/development/compilers/ghc/common-hadrian.nix
+2
-3
pkgs/development/compilers/ghc/common-hadrian.nix
···
36
36
37
37
libiconv ? null,
38
38
ncurses,
39
-
glibcLocales ? null,
40
39
41
40
# GHC can be built with system libffi or a bundled one.
42
41
libffi ? null,
···
549
548
"${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
550
549
}"
551
550
''
552
-
+ lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") ''
553
-
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
551
+
+ lib.optionalString (stdenv.buildPlatform.libc == "glibc") ''
552
+
export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive"
554
553
''
555
554
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
556
555
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+2
-3
pkgs/development/compilers/ghc/common-make-native-bignum.nix
+2
-3
pkgs/development/compilers/ghc/common-make-native-bignum.nix
···
29
29
30
30
libiconv ? null,
31
31
ncurses,
32
-
glibcLocales ? null,
33
32
34
33
# GHC can be built with system libffi or a bundled one.
35
34
libffi ? null,
···
436
435
echo -n "${buildMK}" > mk/build.mk
437
436
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
438
437
''
439
-
+ lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") ''
440
-
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
438
+
+ lib.optionalString (stdenv.buildPlatform.libc == "glibc") ''
439
+
export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive"
441
440
''
442
441
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
443
442
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"