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: f4d163aab740
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b7deb143b298
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 26, 2016

  1. ghcWithPackages: fix env NIX_GHC_LIBDIR value 

    Ideally the duplication between the environment shellHook and the ghc
wrapper would be removed.

Fixes #20730
    @expipiplus1
    expipiplus1 committed Nov 26, 2016
    Copy the full SHA
    757638a View commit details

Commits on Nov 27, 2016

  1. Merge pull request #20731 from expipiplus1/fix-ghc-env 

    ghcWithPackages: fix env NIX_GHC_LIBDIR value
    @peti
    peti authored Nov 27, 2016
    Copy the full SHA
    b7deb14 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/development/haskell-modules/generic-builder.nix
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/generic-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -304,7 +304,7 @@ stdenv.mkDerivation ({
export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"
export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"
export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}"
export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"
${shellHook}
'';
};