From b2c7bda45d582c2a5232bcc11c26c2c6330caa30 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 4 Sep 2015 01:19:53 +0300
Subject: [PATCH] julia03: use bundled llvm
---
pkgs/development/compilers/julia/0.3.nix | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 27b58b4d0f1..76dc6aa1d30 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, fetchurl
# build tools
-, gfortran, git, m4, patchelf, perl, which
+, gfortran, git, m4, patchelf, perl, which, python2
# libjulia dependencies
, libunwind, llvm, readline, utf8proc, zlib
# standard library dependencies
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
name = "dsfmt-${dsfmt_ver}.tar.gz";
md5 = "cb61be3be7254eae39684612c524740d";
};
- in [ dsfmt_src ];
+
+ in [ dsfmt_src llvm.src ];
prePatch = ''
copy_kill_hash(){
@@ -59,12 +60,12 @@ stdenv.mkDerivation rec {
'';
buildInputs =
- [ libunwind llvm readline utf8proc zlib
+ [ libunwind readline utf8proc zlib
double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre
openblas arpack suitesparse
];
- nativeBuildInputs = [ gfortran git m4 patchelf perl which ];
+ nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ];
makeFlags =
let
@@ -96,7 +97,6 @@ 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"
@@ -142,6 +142,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
- broken = false;
};
}