From 247d7c88d228e26a3bfda4f157618ba858114821 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 18 Nov 2016 16:17:14 +0100 Subject: [PATCH] haskell.packages.ghcjs: fix entropy (#20446) --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index c97296cd5bad..b97cbd52fce5 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -130,4 +130,13 @@ self: super: # https://github.com/haskell/haddock/issues/553 wai = dontHaddock super.wai; cereal = addBuildDepend super.cereal [ self.fail ]; + + entropy = overrideCabal super.entropy (old: { + postPatch = old.postPatch or "" + '' + # cabal doesn’t find ghc in this script, since it’s in the bootPkgs + sed -e '/Simple.Program/a import Distribution.Simple.Program.Types' \ + -e 's|mConf.*=.*$|mConf = Just $ simpleConfiguredProgram "ghc" (FoundOnSystem "${self.ghc.bootPkgs.ghc}/bin/ghc")|g' -i Setup.hs + ''; + }); + }