about summary refs log tree commit diff
path: root/pkgs/development/compilers/ghc
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2016-11-15 18:30:26 -0500
committerShea Levy <shea@shealevy.com>2016-11-15 18:30:32 -0500
commit6f7593fddcc70a96d219bd7c72658e6ace8ffa9a (patch)
tree36da78d4cbb41888e1e2a552cdb996fe3077a91e /pkgs/development/compilers/ghc
parenta4cd6f137829ddb6af790fcf5b4c7bd43837fef1 (diff)
downloadnixlib-6f7593fddcc70a96d219bd7c72658e6ace8ffa9a.tar
nixlib-6f7593fddcc70a96d219bd7c72658e6ace8ffa9a.tar.gz
nixlib-6f7593fddcc70a96d219bd7c72658e6ace8ffa9a.tar.bz2
nixlib-6f7593fddcc70a96d219bd7c72658e6ace8ffa9a.tar.lz
nixlib-6f7593fddcc70a96d219bd7c72658e6ace8ffa9a.tar.xz
nixlib-6f7593fddcc70a96d219bd7c72658e6ace8ffa9a.tar.zst
nixlib-6f7593fddcc70a96d219bd7c72658e6ace8ffa9a.zip
ghc-head: fix hash.
Apparently fetchgit lies...
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r--pkgs/development/compilers/ghc/head.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 21f0eecc87f7..2399a44fc0d2 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -24,12 +24,11 @@ in stdenv.mkDerivation (rec {
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "091zpb9vqqy4jqh4q7sz04dh1yfdczaaikbxi5ppim01gzbxwn65";
+    sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y";
   };
 
   postUnpack = ''
-    chmod -R +w ghc
-    pushd ghc
+    pushd ghc-${builtins.substring 0 7 rev}
     echo ${version} >VERSION
     echo ${rev} >GIT_COMMIT_ID
     patchShebangs .
@@ -44,7 +43,7 @@ in stdenv.mkDerivation (rec {
   preConfigure = commonPreConfigure;
 
   configureFlags = [
-    "CC=cc"
+    "CC=${stdenv.cc}/bin/cc"
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [