diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 0cb9ea8b866e..0b22b1ff3812 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -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}" diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 3840ddda57db..8cde6f42148c 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -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}"