Author: viric
Date: 2010-06-12 22:01:41 +0000 (Sat, 12 Jun 2010)
New Revision: 22239

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22239&view=rev

Modified:
   nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix

Log:
Fixing the nixpkgs tarball build
Fixing the clang fetchsvn hash. I don't know why it does not match that given 
by nix-prefetch-svn, but
I set that given by nix-build.

Changes:

Modified: nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix
===================================================================
--- nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix   2010-06-12 
21:52:50 UTC (rev 22238)
+++ nixpkgs/trunk/pkgs/development/compilers/llvm/default.nix   2010-06-12 
22:01:41 UTC (rev 22239)
@@ -21,7 +21,9 @@
 }
 //
 (if buildClang then 
-
+  # I write the assert because 'gcc.libc' will be evaluated although 'triplet' 
would not
+  # evaluate properly (in the preConfigure below)
+  assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
   let
     triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
               else if (stdenv.system == "x86_64-linux") then 
"x86_64-unknown-linux-gnu"
@@ -30,7 +32,7 @@
     srcClang = fetchsvn {
       url = http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_27;
       rev = 105900;
-      sha256 = "0sfj9glc5yi5fb23h1xihs11l420wzghkm5pk4kwg6pw4w19xg00";
+      sha256 = 
"fe79988950319b62d3bca34848424f20a3f33c8182507df222f2ac93fbacf671";
     };
 
     prePatch = ''

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to