From 88864e331a9664b605707fb48f8ec2b3395a55bd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 4 May 2013 17:29:51 -0400 Subject: [PATCH] Try to fix the tarball. stdenv.gcc.gcc might be null, e.g. on ppc-linux Signed-off-by: Shea Levy --- pkgs/development/compilers/llvm/clang.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index bd6b0a6f202..c2117798666 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }: -let version = "3.2"; in +let + version = "3.2"; + gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; +in stdenv.mkDerivation { name = "clang-${version}"; @@ -13,7 +16,7 @@ stdenv.mkDerivation { "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_TARGETS_TO_BUILD=all" - "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}" + "-DGCC_INSTALL_PREFIX=${gccReal}" ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" ];