From 8142cad918f09101bddb9502abe8ba27286ca973 Mon Sep 17 00:00:00 2001 From: MarcFontaine Date: Sun, 10 Nov 2019 18:53:28 +0100 Subject: [PATCH] ghcjs : fix the patch for ghc-paths-package 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. --- .../haskell-modules/patches/ghc-paths-nix-ghcjs.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch index 26ea0eaa5a8..48cf6a035af 100644 --- a/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch +++ b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch @@ -43,13 +43,13 @@ index c87565d..88b3db4 100644 +ghc = fromMaybe GHC_PATHS_GHC nixGhc +ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg diff --git a/Setup.hs b/Setup.hs -index fad5026..1651650 100644 +index f2d1733..ca4792e 100644 --- a/Setup.hs +++ b/Setup.hs -@@ -27,13 +27,13 @@ main = defaultMainWithHooks simpleUserHooks { - defaultPostConf :: Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO () - defaultPostConf args flags pkgdescr lbi = do +@@ -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_