From 78ccc14e3eac5d4d5184b61d4cdb7e95990b7c6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Jul 2011 12:00:19 +0000 Subject: ghc-6.10.1-binary: revert blind attempt to bootstrap GHC on x86_64-darwin with the i686 version of this compiler Hydra says that we can *not* use the i686 compiler to bootstrap x86_64 on Darwin. Duh. svn path=/nixpkgs/trunk/; revision=27753 --- pkgs/development/compilers/ghc/6.10.1-binary.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix index 7052d6211bb0..459a1b94724d 100644 --- a/pkgs/development/compilers/ghc/6.10.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, perl, libedit, ncurses, gmp}: -assert stdenv.system == "x86_64-darwin" || stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; +assert stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; stdenv.mkDerivation rec { version = "6.10.1"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; sha256 = "14jvvn333i36wm7mmvi47jr93f5hxrw1h2dpjvqql0rp00svhzzg"; } - else if (stdenv.system == "i686-darwin" || stdenv.system == "x86_64-darwin") then + else if stdenv.system == "i686-darwin" then fetchurl { # Idem. url = "http://haskell.org/ghc/dist/${version}/maeder/ghc-${version}-i386-apple-darwin.tar.bz2"; @@ -100,10 +100,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - }; + meta.platforms = [ "i686-darwin" "x86_64-linux" "i686-linux"] ; } -- cgit 1.4.1