ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

ghc-6.10.1-binary: revert blind attempt to bootstrap GHC on x86_64-darwin with the i686 version of this compiler

Browse Source 
Hydra says that we can *not* use the i686 compiler to bootstrap x86_64 on Darwin. Duh.

svn path=/nixpkgs/trunk/; revision=27753
This commit is contained in:
Peter Simons 2011-07-13 12:00:19 +00:00
parent 35505a442e
commit 78ccc14e3e
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/ghc/6.10.1-binary.nix
View File

@ -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"] ;
}