From 0ef5f0961f0609d335bfce361a6c862251c97ed6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 5 Apr 2012 19:07:14 +0000 Subject: [PATCH] Trying to remove tarball error svn path=/nixpkgs/trunk/; revision=33631 --- pkgs/development/compilers/julia/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 4ab42562e74..4e2fc8f8f24 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -4,6 +4,7 @@ } : let liblapackShared = liblapack.override{shared=true;}; + realGcc = stdenv.gcc.gcc; in stdenv.mkDerivation rec { pname = "julia"; @@ -68,7 +69,8 @@ stdenv.mkDerivation rec { sed -e '/cd SuiteSparse-SYSTEM/,+1s@find /lib /usr/lib /usr/local/lib@find ${suitesparse}/lib@' -i external/Makefile - export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.gcc.gcc}/lib -L${stdenv.gcc.gcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk " + ${if realGcc ==null then "" else + ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk "''} sed -e 's@ cpp @ gcc -E @g' -i base/Makefile '';