summary refs log tree commit diff
diff options
context:
space:
mode:
authorCharles Strahan <charles.c.strahan@gmail.com>2015-05-05 20:43:47 -0400
committerCharles Strahan <charles.c.strahan@gmail.com>2015-05-05 20:48:27 -0400
commit9a658d340fc6fe2cfaa47309e216fab8235445a9 (patch)
treedd5d5509ec48b8f1f3ef6781a43561b645663f40
parent007dfb8438cc360acfe4a43dec68f7f08c04196a (diff)
downloadnixpkgs-9a658d340fc6fe2cfaa47309e216fab8235445a9.tar
nixpkgs-9a658d340fc6fe2cfaa47309e216fab8235445a9.tar.gz
nixpkgs-9a658d340fc6fe2cfaa47309e216fab8235445a9.tar.bz2
nixpkgs-9a658d340fc6fe2cfaa47309e216fab8235445a9.tar.lz
nixpkgs-9a658d340fc6fe2cfaa47309e216fab8235445a9.tar.xz
nixpkgs-9a658d340fc6fe2cfaa47309e216fab8235445a9.tar.zst
nixpkgs-9a658d340fc6fe2cfaa47309e216fab8235445a9.zip
ghc-7.10.1: fix user pkg db location for GHCJS
This cherry picks the commit referenced on the associated trac ticket:
https://ghc.haskell.org/trac/ghc/ticket/10232
-rw-r--r--pkgs/development/compilers/ghc/7.10.1.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix
index 5bec1fa3f55..4eb4a501e4e 100644
--- a/pkgs/development/compilers/ghc/7.10.1.nix
+++ b/pkgs/development/compilers/ghc/7.10.1.nix
@@ -35,6 +35,15 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  patches = [
+    # Fix user pkg db location for GHCJS: 
+    # https://ghc.haskell.org/trac/ghc/ticket/10232
+    (fetchpatch {
+      url = "https://git.haskell.org/ghc.git/patch/c46e4b184e0abc158ad8f1eff6b3f0421acaf984";
+      sha256 = "0fkdyqd4bqp742rydwmqq8d2n7gf61bgdhaiw8xf7jy0ix7lr60w";
+    })
+  ];
+
   postPatch = ''
     pushd libraries/Cabal
     patch -p1 < ${cabalPatch}