diff options
author | Charles Strahan <charles.c.strahan@gmail.com> | 2016-01-24 13:27:41 -0500 |
---|---|---|
committer | Charles Strahan <charles.c.strahan@gmail.com> | 2016-01-24 13:28:24 -0500 |
commit | 700e4aebdca96e6e81a5956de59ff16b8347e596 (patch) | |
tree | ed7ab4885fec49836d7a5fc8d60f845230c56fd5 /pkgs/development | |
parent | 9aac99ccb07ced3fe4f75a43b8934549580d5c85 (diff) | |
download | nixlib-700e4aebdca96e6e81a5956de59ff16b8347e596.tar nixlib-700e4aebdca96e6e81a5956de59ff16b8347e596.tar.gz nixlib-700e4aebdca96e6e81a5956de59ff16b8347e596.tar.bz2 nixlib-700e4aebdca96e6e81a5956de59ff16b8347e596.tar.lz nixlib-700e4aebdca96e6e81a5956de59ff16b8347e596.tar.xz nixlib-700e4aebdca96e6e81a5956de59ff16b8347e596.tar.zst nixlib-700e4aebdca96e6e81a5956de59ff16b8347e596.zip |
ghcjs: fix the build
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 1dee12ca12c0..5d7b8d65b6a4 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -52,7 +52,7 @@ mkDerivation (rec { }; isLibrary = true; isExecutable = true; - jailbreak = true; + jailbreak = false; # manually jailbreak, until postPatch in mkDerivation is fixed doHaddock = false; doCheck = false; buildDepends = [ @@ -72,6 +72,9 @@ mkDerivation (rec { ]; patches = [ ./ghcjs.patch ]; postPatch = '' + echo "Run jailbreak-cabal to lift version restrictions on build inputs." + ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal + substituteInPlace Setup.hs \ --replace "/usr/bin/env" "${coreutils}/bin/env" @@ -119,5 +122,4 @@ mkDerivation (rec { license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; - broken = true; # depends on outdated versions of its Haskell build inputs }) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 6f68dec78e49..ca940e8de31c 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -58,7 +58,7 @@ self: super: { # These packages are core libraries in GHC 7.10.x, but not here. bin-package-db = null; 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; terminfo = self.terminfo_0_4_0_1; xhtml = self.xhtml_3000_2_1; |