public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghcjs : fix the patch for ghc-paths-package

Browse Source 
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.
This commit is contained in:
MarcFontaine 2019-11-10 18:53:28 +01:00
parent 488e6b7a23
commit 8142cad918
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
View File

@ -43,13 +43,13 @@ index c87565d..88b3db4 100644
+ghc = fromMaybe GHC_PATHS_GHC nixGhc +ghc = fromMaybe GHC_PATHS_GHC nixGhc
+ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg +ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg
diff --git a/Setup.hs b/Setup.hs diff --git a/Setup.hs b/Setup.hs
index fad5026..1651650 100644 index f2d1733..ca4792e 100644
--- a/Setup.hs --- a/Setup.hs
+++ b/Setup.hs +++ b/Setup.hs
@@ -27,13 +27,13 @@ main = defaultMainWithHooks simpleUserHooks { @@ -39,13 +39,13 @@ main = defaultMainWithHooks simpleUserHooks {
defaultPostConf :: Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO () #else
defaultPostConf args flags pkgdescr lbi = do
libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags)) libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags))
#endif
- ghcProgram (withPrograms lbi) ["--print-libdir"] - ghcProgram (withPrograms lbi) ["--print-libdir"]
+ ghcjsProgram (withPrograms lbi) ["--print-libdir"] + ghcjsProgram (withPrograms lbi) ["--print-libdir"]
let libdir = reverse $ dropWhile isSpace $ reverse libdir_ let libdir = reverse $ dropWhile isSpace $ reverse libdir_