From 757638acae621c07d457a3e6a77176675a207dd0 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 26 Nov 2016 12:06:56 +0000 Subject: [PATCH] ghcWithPackages: fix env NIX_GHC_LIBDIR value Ideally the duplication between the environment shellHook and the ghc wrapper would be removed. Fixes #20730 --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 16855842464..6c75c1f3550 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -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} ''; };