public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing the nixpkgs tarball build

Browse Source 
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
This commit is contained in:
Lluís Batlle i Rossell 2010-06-12 22:01:41 +00:00
parent a4a34dd6e4
commit 6bc2fcd511
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/llvm/default.nix
View File

@ -21,7 +21,9 @@ stdenv.mkDerivation ({
} }
// //
(if buildClang then (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 let
triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu" triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu" else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
@ -30,7 +32,7 @@ stdenv.mkDerivation ({
srcClang = fetchsvn { srcClang = fetchsvn {
url = http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_27; url = http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_27;
rev = 105900; rev = 105900;
sha256 = "0sfj9glc5yi5fb23h1xihs11l420wzghkm5pk4kwg6pw4w19xg00"; sha256 = "fe79988950319b62d3bca34848424f20a3f33c8182507df222f2ac93fbacf671";
}; };
prePatch = '' prePatch = ''