diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-06-12 08:06:03 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-06-12 08:06:03 -0500 |
| commit | 2a2448bcb72c0a5a367a63b0f7b8ffd3453d0e67 (patch) | |
| tree | a05cdb0ad67b1026561314999769c791968224d6 /pkgs/applications/science | |
| parent | cb6daa036bf4de47fc73ad4a9ce218d845902a5d (diff) | |
| parent | c02dd4a7260f36901088830ae23d9723968ed066 (diff) | |
| download | nixlib-2a2448bcb72c0a5a367a63b0f7b8ffd3453d0e67.tar nixlib-2a2448bcb72c0a5a367a63b0f7b8ffd3453d0e67.tar.gz nixlib-2a2448bcb72c0a5a367a63b0f7b8ffd3453d0e67.tar.bz2 nixlib-2a2448bcb72c0a5a367a63b0f7b8ffd3453d0e67.tar.lz nixlib-2a2448bcb72c0a5a367a63b0f7b8ffd3453d0e67.tar.xz nixlib-2a2448bcb72c0a5a367a63b0f7b8ffd3453d0e67.tar.zst nixlib-2a2448bcb72c0a5a367a63b0f7b8ffd3453d0e67.zip | |
Merge pull request #8182 from ttuegel/openblas
Numerical computing overhaul
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/science/math/jags/default.nix | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index d0adb3382079..72de0677e73a 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt +{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt , libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl , texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison -, imake, which, jdk, atlas +, imake, which, jdk, openblas , withRecommendedPackages ? true }: @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { sha256 = "0dagyqgvi8i3nw158qi2zpwm04s4ffzvnmk5niaksvxs30zrbbpm"; }; - buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt + buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake - which jdk atlas + which jdk openblas ]; patches = [ ./no-usr-local-search-paths.patch ]; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { configureFlagsArray=( --disable-lto --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages - --with-blas="-L${atlas}/lib -lf77blas -latlas" - --with-lapack="-L${liblapack}/lib -llapack" + --with-blas="-L${openblas}/lib -lopenblas" + --with-lapack="-L${openblas}/lib -lopenblas" --with-readline --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-cairo diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 785c2460bb49..9d70d2686911 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran, liblapack, blas}: +{stdenv, fetchurl, gfortran, openblas}: stdenv.mkDerivation rec { name = "JAGS-3.4.0"; @@ -6,7 +6,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; sha256 = "0ayqsz9kkmbss7mxlwr34ch2z1vsb65lryjzqpprab1ccyiaksib"; }; - buildInputs = [gfortran liblapack blas]; + buildInputs = [gfortran openblas]; + configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ]; meta = { description = "Just Another Gibbs Sampler"; |