summary refs log tree commit diff
path: root/pkgs/development/compilers/ghc
diff options
context:
space:
mode:
authorAndres Löh <mail@andres-loeh.de>2011-12-16 18:11:23 +0000
committerAndres Löh <mail@andres-loeh.de>2011-12-16 18:11:23 +0000
commitc11749dcd652cb986efdb3ddd704b41c07208c54 (patch)
treefa81887a0b3a65ae62afe84924f215820c426915 /pkgs/development/compilers/ghc
parentc919a8ae2161925275215dbd57a9cc3e0a1edf03 (diff)
downloadnixpkgs-c11749dcd652cb986efdb3ddd704b41c07208c54.tar
nixpkgs-c11749dcd652cb986efdb3ddd704b41c07208c54.tar.gz
nixpkgs-c11749dcd652cb986efdb3ddd704b41c07208c54.tar.bz2
nixpkgs-c11749dcd652cb986efdb3ddd704b41c07208c54.tar.lz
nixpkgs-c11749dcd652cb986efdb3ddd704b41c07208c54.tar.xz
nixpkgs-c11749dcd652cb986efdb3ddd704b41c07208c54.tar.zst
nixpkgs-c11749dcd652cb986efdb3ddd704b41c07208c54.zip
Updated the GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=30937
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r--pkgs/development/compilers/ghc/head.nix18
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 8e60b4f2fc1..330165437d5 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,19 +1,17 @@
-{stdenv, fetchurl, ghc, perl, gmp, ncurses}:
+{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
 
 stdenv.mkDerivation rec {
-  version = "7.3.20110910";
+  version = "7.3.20111212";
 
   name = "ghc-${version}";
 
-  # TODO: Does this have to be here, or can it go to meta?
-  homepage = "http://haskell.org/ghc";
-
   src = fetchurl {
-    url = "${homepage}/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "1y8ixh6vcbqxqddc872kjfzxj94q4dhyaprdv7kv2yzwgp49qza5";
+    url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
+    sha256 = "1i8zw3qaihzbgygdlip9d5g5321wv1yhashf8nrinwgy5649rsyf";
   };
 
-  buildInputs = [ghc perl gmp ncurses];
+  buildInputs = [ghc perl gmp ncurses] ++
+    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
@@ -22,6 +20,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '';
 
   configureFlags=[
@@ -33,11 +32,12 @@ stdenv.mkDerivation rec {
   stripDebugFlags=["-S" "--keep-file-symbols"];
 
   meta = {
-    inherit homepage;
+    homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
     maintainers = [
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
+      stdenv.lib.maintainers.simons
     ];
     platforms = ghc.meta.platforms;
   };