From 31dde168810c7dbb241c4be9502aa22eefe03f8a Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Fri, 8 May 2015 11:53:28 -0400 Subject: ghcjs: set NIX_GHCJS_* variables in env. --- pkgs/development/haskell-modules/generic-builder.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs/development/haskell-modules/generic-builder.nix') diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 28fcf45bfa2..d441b824842 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -51,7 +51,7 @@ assert editedCabalFile != null -> revision != null; let inherit (stdenv.lib) optional optionals optionalString versionOlder - concatStringsSep enableFeature optionalAttrs; + concatStringsSep enableFeature optionalAttrs toUpper; isGhcjs = ghc.isGhcjs or false; @@ -116,6 +116,7 @@ let setupCommand = if isGhcjs then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js" else "./Setup"; ghcCommand = if isGhcjs then "ghcjs" else "ghc"; + ghcCommandCaps = toUpper ghcCommand; in stdenv.mkDerivation ({ @@ -264,10 +265,10 @@ stdenv.mkDerivation ({ LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' - export NIX_GHC="${ghcEnv}/bin/${ghcCommand}" - export NIX_GHCPKG="${ghcEnv}/bin/${ghcCommand}-pkg" - export NIX_GHC_DOCDIR="${ghcEnv}/share/doc/ghc/html" - export NIX_GHC_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}" + 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}" ''; }; -- cgit 1.4.1