8142cad918
This patch is used in pkgs/development/haskell-modules/configuration-ghcjs.nix to fix the ghc-path package for use with ghcjs. The ghc-paths package has been updated in a way that the existing patch can no longer be applied.
66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
diff --git a/GHC/Paths.hs b/GHC/Paths.hs
|
|
index c87565d..88b3db4 100644
|
|
--- a/GHC/Paths.hs
|
|
+++ b/GHC/Paths.hs
|
|
@@ -1,13 +1,35 @@
|
|
{-# LANGUAGE CPP #-}
|
|
+{-# LANGUAGE ScopedTypeVariables #-}
|
|
|
|
module GHC.Paths (
|
|
ghc, ghc_pkg, libdir, docdir
|
|
) where
|
|
|
|
+import Control.Exception as E
|
|
+import Data.Maybe
|
|
+import System.Environment
|
|
+import System.IO.Unsafe
|
|
+
|
|
+-- Yes, there's lookupEnv now, but we want to be compatible
|
|
+-- with older GHCs.
|
|
+checkEnv :: String -> IO (Maybe String)
|
|
+checkEnv var = E.catch (fmap Just (getEnv var))
|
|
+ (\ (e :: IOException) -> return Nothing)
|
|
+
|
|
+nixLibdir, nixDocdir, nixGhc, nixGhcPkg :: Maybe FilePath
|
|
+nixLibdir = unsafePerformIO (checkEnv "NIX_GHCJS_LIBDIR")
|
|
+nixDocdir = unsafePerformIO (checkEnv "NIX_GHCJS_DOCDIR")
|
|
+nixGhc = unsafePerformIO (checkEnv "NIX_GHCJS")
|
|
+nixGhcPkg = unsafePerformIO (checkEnv "NIX_GHCJSPKG")
|
|
+{-# NOINLINE nixLibdir #-}
|
|
+{-# NOINLINE nixDocdir #-}
|
|
+{-# NOINLINE nixGhc #-}
|
|
+{-# NOINLINE nixGhcPkg #-}
|
|
+
|
|
libdir, docdir, ghc, ghc_pkg :: FilePath
|
|
|
|
-libdir = GHC_PATHS_LIBDIR
|
|
-docdir = GHC_PATHS_DOCDIR
|
|
+libdir = fromMaybe GHC_PATHS_LIBDIR nixLibdir
|
|
+docdir = fromMaybe GHC_PATHS_DOCDIR nixDocdir
|
|
|
|
-ghc = GHC_PATHS_GHC
|
|
-ghc_pkg = GHC_PATHS_GHC_PKG
|
|
+ghc = fromMaybe GHC_PATHS_GHC nixGhc
|
|
+ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg
|
|
diff --git a/Setup.hs b/Setup.hs
|
|
index f2d1733..ca4792e 100644
|
|
--- a/Setup.hs
|
|
+++ b/Setup.hs
|
|
@@ -39,13 +39,13 @@ main = defaultMainWithHooks simpleUserHooks {
|
|
#else
|
|
libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags))
|
|
#endif
|
|
- ghcProgram (withPrograms lbi) ["--print-libdir"]
|
|
+ ghcjsProgram (withPrograms lbi) ["--print-libdir"]
|
|
let libdir = reverse $ dropWhile isSpace $ reverse libdir_
|
|
|
|
- ghc_pkg = case lookupProgram ghcPkgProgram (withPrograms lbi) of
|
|
+ ghc_pkg = case lookupProgram ghcjsPkgProgram (withPrograms lbi) of
|
|
Just p -> programPath p
|
|
Nothing -> error "ghc-pkg was not found"
|
|
- ghc = case lookupProgram ghcProgram (withPrograms lbi) of
|
|
+ ghc = case lookupProgram ghcjsProgram (withPrograms lbi) of
|
|
Just p -> programPath p
|
|
Nothing -> error "ghc was not found"
|
|
|