Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b46aea76e996
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a30ab38656e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 20, 2018

  1. haskell: only use glibcLocales when using glibc 

    Fixes eval w/musl.

Possible alternative would be using glibcLocales
when it is non-null, to avoid duplicating the logic.
    @dtzWill
    dtzWill committed Mar 20, 2018
    Copy the full SHA
    8727284 View commit details

Commits on Mar 21, 2018

  1. Merge pull request #37486 from dtzWill/fix/ghc-glibcLocales 

    haskell: only use glibcLocales when using glibc
    @dtzWill
    dtzWill authored Mar 21, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2a30ab3 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/haskell-modules/generic-builder.nix
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/generic-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -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"; }
)