commit 677eada98b8917ed58fd13d9251522e4ccb7da3a · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

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

authored by Wolfgang Walther and committed by GitHub 5 months ago 677eada9 b85d8372

+4 -6

2 changed files

expand all

unified split

pkgs

development

compilers

ghc

common-hadrian.nix

common-make-native-bignum.nix

+2 -3

pkgs/development/compilers/ghc/common-hadrian.nix

··· 36 37 libiconv ? null, 38 ncurses, 39 - glibcLocales ? null, 40 41 # GHC can be built with system libffi or a bundled one. 42 libffi ? null, ··· 549 "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" 550 }" 551 '' 552 - + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") '' 553 - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" 554 '' 555 + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' 556 export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"

··· 36 37 libiconv ? null, 38 ncurses, 39 40 # GHC can be built with system libffi or a bundled one. 41 libffi ? null, ··· 548 "${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" 549 }" 550 '' 551 + + lib.optionalString (stdenv.buildPlatform.libc == "glibc") '' 552 + export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive" 553 '' 554 + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' 555 export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"

+2 -3

pkgs/development/compilers/ghc/common-make-native-bignum.nix

··· 29 30 libiconv ? null, 31 ncurses, 32 - glibcLocales ? null, 33 34 # GHC can be built with system libffi or a bundled one. 35 libffi ? null, ··· 436 echo -n "${buildMK}" > mk/build.mk 437 sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure 438 '' 439 - + lib.optionalString (stdenv.hostPlatform.isLinux && hostPlatform.libc == "glibc") '' 440 - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" 441 '' 442 + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' 443 export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"

··· 29 30 libiconv ? null, 31 ncurses, 32 33 # GHC can be built with system libffi or a bundled one. 34 libffi ? null, ··· 435 echo -n "${buildMK}" > mk/build.mk 436 sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure 437 '' 438 + + lib.optionalString (stdenv.buildPlatform.libc == "glibc") '' 439 + export LOCALE_ARCHIVE="${buildPackages.glibcLocales}/lib/locale/locale-archive" 440 '' 441 + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' 442 export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"