suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

ghcjs: fix the build

Browse Source
This commit is contained in:
Charles Strahan 2016-01-24 13:27:41 -05:00
parent 9aac99ccb0
commit 700e4aebdc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/ghcjs/default.nix
View File

@ -52,7 +52,7 @@ mkDerivation (rec {
}; };
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
jailbreak = true; jailbreak = false; # manually jailbreak, until postPatch in mkDerivation is fixed
doHaddock = false; doHaddock = false;
doCheck = false; doCheck = false;
buildDepends = [ buildDepends = [
@ -72,6 +72,9 @@ mkDerivation (rec {
]; ];
patches = [ ./ghcjs.patch ]; patches = [ ./ghcjs.patch ];
postPatch = '' postPatch = ''
echo "Run jailbreak-cabal to lift version restrictions on build inputs."
${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
substituteInPlace Setup.hs \ substituteInPlace Setup.hs \
--replace "/usr/bin/env" "${coreutils}/bin/env" --replace "/usr/bin/env" "${coreutils}/bin/env"
@ -119,5 +122,4 @@ mkDerivation (rec {
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = ghc.meta.platforms; platforms = ghc.meta.platforms;
maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
broken = true; # depends on outdated versions of its Haskell build inputs
}) })

2
pkgs/development/haskell-modules/configuration-ghcjs.nix
View File

@ -58,7 +58,7 @@ self: super: {
# These packages are core libraries in GHC 7.10.x, but not here. # These packages are core libraries in GHC 7.10.x, but not here.
bin-package-db = null; bin-package-db = null;
haskeline = self.haskeline_0_7_2_1; haskeline = self.haskeline_0_7_2_1;
hoopl = self.hoopl_3_10_2_0; hoopl = self.hoopl_3_10_2_1;
hpc = self.hpc_0_6_0_2; hpc = self.hpc_0_6_0_2;
terminfo = self.terminfo_0_4_0_1; terminfo = self.terminfo_0_4_0_1;
xhtml = self.xhtml_3000_2_1; xhtml = self.xhtml_3000_2_1;