diff options
| author | Will Dietz <github@wdtz.org> | 2018-03-20 22:55:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 22:55:44 -0500 |
| commit | 2a30ab38656e07daa183ffd4b8f3c89614f975d8 (patch) | |
| tree | 6f448339c2cd793347c64442c6c77ff2f7f0a7bb /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | b46aea76e996d73def17a0c91b9bc3f26abe662a (diff) | |
| parent | 8727284a4b211556f59d700c41fa40ec33a78cd2 (diff) | |
| download | nixlib-2a30ab38656e07daa183ffd4b8f3c89614f975d8.tar nixlib-2a30ab38656e07daa183ffd4b8f3c89614f975d8.tar.gz nixlib-2a30ab38656e07daa183ffd4b8f3c89614f975d8.tar.bz2 nixlib-2a30ab38656e07daa183ffd4b8f3c89614f975d8.tar.lz nixlib-2a30ab38656e07daa183ffd4b8f3c89614f975d8.tar.xz nixlib-2a30ab38656e07daa183ffd4b8f3c89614f975d8.tar.zst nixlib-2a30ab38656e07daa183ffd4b8f3c89614f975d8.zip | |
Merge pull request #37486 from dtzWill/fix/ghc-glibcLocales
haskell: only use glibcLocales when using glibc
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 45299e013696..3f45a795586c 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -391,7 +391,7 @@ stdenv.mkDerivation ({ buildInputs = systemBuildInputs; nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = optionalString (stdenv.hostPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}" export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" @@ -435,5 +435,5 @@ stdenv.mkDerivation ({ // optionalAttrs (postFixup != "") { inherit postFixup; } // optionalAttrs (dontStrip) { inherit dontStrip; } // optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; } -// optionalAttrs (buildPlatform.isLinux){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } +// optionalAttrs (buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) |