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

julia03: use system LLVM

Browse Source 
It should be safe to use the Nixpkgs LLVM again, now that the approriate
patches have been backported. Hopefully, this will also fix the i686
build.
This commit is contained in:
Thomas Tuegel
2015-09-19 08:15:33 -05:00
parent 4a8fbb789a
commit 1daa0b39f6
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/compilers/julia/0.3.nix
View File

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
md5 = "cb61be3be7254eae39684612c524740d";
};
in [ dsfmt_src llvm.src ];
in [ dsfmt_src ];
prePatch = ''
copy_kill_hash(){
@@ -70,22 +70,18 @@ stdenv.mkDerivation rec {
sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
'';
buildInputs =
[ libunwind readline utf8proc zlib
double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
openblas arpack suitesparse
];
buildInputs = [
arpack double_conversion fftw fftwSinglePrec glpk gmp libunwind
llvm mpfr pcre openblas readline suitesparse utf8proc zlib
];
nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
nativeBuildInputs = [ gfortran git m4 patchelf perl python2 which ];
makeFlags =
let
arch = head (splitString "-" stdenv.system);
march =
{ "x86_64-linux" = "x86-64";
"x86_64-darwin" = "x86-64";
"i686-linux" = "i686";
}."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}"
or (throw "unsupported architecture: ${arch}");
in [
"ARCH=${arch}"
"MARCH=${march}"
@@ -108,6 +104,7 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_GMP=1"
"USE_SYSTEM_GRISU=1"
"USE_SYSTEM_LIBUNWIND=1"
"USE_SYSTEM_LLVM=1"
"USE_SYSTEM_MPFR=1"
"USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=1"