Unverified Commit 677eada9 authored by Wolfgang Walther's avatar Wolfgang Walther Committed by GitHub
Browse files

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

parents b85d8372 e7627649

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

+2 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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}"