Author: raskin
Date: Thu Apr 5 19:07:14 2012
New Revision: 33631
URL: https://nixos.org/websvn/nix/?rev=33631&sc=1
Log:
Trying to remove tarball error
Modified:
nixpkgs/trunk/pkgs/development/compilers/julia/default.nix
Modified: nixpkgs/trunk/pkgs/development/compilers/julia/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/julia/default.nix Thu Apr 5
17:32:02 2012 (r33630)
+++ nixpkgs/trunk/pkgs/development/compilers/julia/default.nix Thu Apr 5
19:07:14 2012 (r33631)
@@ -4,6 +4,7 @@
} :
let
liblapackShared = liblapack.override{shared=true;};
+ realGcc = stdenv.gcc.gcc;
in
stdenv.mkDerivation rec {
pname = "julia";
@@ -68,7 +69,8 @@
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
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
