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

Merge pull request #9648 from abbradar/julia-llvm 

Use bundled LLVM with Julia
This commit is contained in:
Thomas Tuegel 2015-09-03 19:27:51 -05:00
parent c31a677482 b2c7bda45d
commit ff0e2c8658
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchgit, fetchurl { stdenv, fetchgit, fetchurl
# build tools # build tools
, gfortran, git, m4, patchelf, perl, which , gfortran, git, m4, patchelf, perl, which, python2
# libjulia dependencies # libjulia dependencies
, libunwind, llvm, readline, utf8proc, zlib , libunwind, llvm, readline, utf8proc, zlib
# standard library dependencies # standard library dependencies
@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
name = "dsfmt-${dsfmt_ver}.tar.gz"; name = "dsfmt-${dsfmt_ver}.tar.gz";
md5 = "cb61be3be7254eae39684612c524740d"; md5 = "cb61be3be7254eae39684612c524740d";
}; };
in [ dsfmt_src ];
in [ dsfmt_src llvm.src ];
prePatch = '' prePatch = ''
copy_kill_hash(){ copy_kill_hash(){
@ -59,12 +60,12 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = buildInputs =
[ libunwind llvm readline utf8proc zlib [ libunwind readline utf8proc zlib
double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
openblas arpack suitesparse openblas arpack suitesparse
]; ];
nativeBuildInputs = [ gfortran git m4 patchelf perl which ]; nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
makeFlags = makeFlags =
let let
@ -96,7 +97,6 @@ stdenv.mkDerivation rec {
"USE_SYSTEM_GMP=1" "USE_SYSTEM_GMP=1"
"USE_SYSTEM_GRISU=1" "USE_SYSTEM_GRISU=1"
"USE_SYSTEM_LIBUNWIND=1" "USE_SYSTEM_LIBUNWIND=1"
"USE_SYSTEM_LLVM=1"
"USE_SYSTEM_MPFR=1" "USE_SYSTEM_MPFR=1"
"USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PATCHELF=1"
"USE_SYSTEM_PCRE=1" "USE_SYSTEM_PCRE=1"
@ -142,6 +142,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ]; maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
broken = false;
}; };
} }