diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b78c3a237ff..438db4c127d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2365,7 +2365,13 @@ let jikes = callPackage ../development/compilers/jikes { }; - julia = callPackage ../development/compilers/julia { }; + julia = callPackage ../development/compilers/julia { + llvm = llvm_3_1; + pcre = pcre_8_30; + liblapack = liblapack.override {shared = true;}; + fftw = fftw.override {pthreads = true;}; + fftwSinglePrec = fftwSinglePrec.override {pthreads = true;}; + }; lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { inherit makeWrapper gtk glib pango atk gdk_pixbuf; @@ -4552,6 +4558,11 @@ let cplusplusSupport = !stdenv ? isDietLibC; }; + pcre_8_30 = callPackage ../development/libraries/pcre/8.30.nix { + unicodeSupport = getConfig ["pcre" "unicode"] true; + cplusplusSupport = !stdenv ? isDietLibC; + }; + pdf2xml = callPackage ../development/libraries/pdf2xml {} ; phonon = callPackage ../development/libraries/phonon { }; @@ -8367,6 +8378,7 @@ let liblapack = callPackage ../development/libraries/science/math/liblapack { }; + openblas = callPackage ../development/libraries/science/math/openblas { }; ### SCIENCE/LOGIC |