From 6bc2fcd511f510827dc5fe08ae5d2180a39f5815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 12 Jun 2010 22:01:41 +0000 Subject: [PATCH] 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. svn path=/nixpkgs/trunk/; revision=22239 --- pkgs/development/compilers/llvm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index a89ee3d04836..c8d90dfb922c 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -21,7 +21,9 @@ stdenv.mkDerivation ({ } // (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 @@ stdenv.mkDerivation ({ srcClang = fetchsvn { url = http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_27; rev = 105900; - sha256 = "0sfj9glc5yi5fb23h1xihs11l420wzghkm5pk4kwg6pw4w19xg00"; + sha256 = "fe79988950319b62d3bca34848424f20a3f33c8182507df222f2ac93fbacf671"; }; prePatch = ''