Author: simons
Date: Wed Jul 13 11:09:06 2011
New Revision: 27751
URL: https://svn.nixos.org/websvn/nix/?rev=27751&sc=1
Log:
ghc-6.10.1-binary: blind attempt to bootstrap GHC on x86_64-darwin with the
i686 version of this compiler
I have no idea whether that's going to work, and I can't test it for
lack of access to a MacOS X machine, but think chances are pretty good
that this is going to succeed.
Modified:
nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix Wed Jul
13 10:56:52 2011 (r27750)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1-binary.nix Wed Jul
13 11:09:06 2011 (r27751)
@@ -1,6 +1,6 @@
{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
-assert stdenv.system == "i686-darwin" || stdenv.system == "x86_64-linux" ||
stdenv.system == "i686-linux";
+assert stdenv.system == "x86_64-darwin" || stdenv.system == "i686-darwin" ||
stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
stdenv.mkDerivation rec {
version = "6.10.1";
@@ -20,7 +20,7 @@
url =
"http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2";;
sha256 = "14jvvn333i36wm7mmvi47jr93f5hxrw1h2dpjvqql0rp00svhzzg";
}
- else if stdenv.system == "i686-darwin" then
+ else if (stdenv.system == "i686-darwin" || stdenv.system ==
"x86_64-darwin") then
fetchurl {
# Idem.
url =
"http://haskell.org/ghc/dist/${version}/maeder/ghc-${version}-i386-apple-darwin.tar.bz2";;
@@ -100,5 +100,10 @@
[ $(./main) == "yes" ]
'';
- meta.platforms = [ "i686-darwin" "x86_64-linux" "i686-linux"] ;
+ 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;
+ };
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
