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

R: build with openblas

Browse Source 
Fixes #6393.
This commit is contained in:
Thomas Tuegel 2015-06-04 16:49:04 -05:00
parent 90b2afee04
commit e729a88474
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/science/math/R/default.nix
View File

@ -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 , libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl
, texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison , texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison
, imake, which, jdk, atlas , imake, which, jdk, openblas
, withRecommendedPackages ? true , withRecommendedPackages ? true
}: }:
@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "0dagyqgvi8i3nw158qi2zpwm04s4ffzvnmk5niaksvxs30zrbbpm"; 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 libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl
texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake
which jdk atlas which jdk openblas
]; ];
patches = [ ./no-usr-local-search-paths.patch ]; patches = [ ./no-usr-local-search-paths.patch ];
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
configureFlagsArray=( configureFlagsArray=(
--disable-lto --disable-lto
--with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages
--with-blas="-L${atlas}/lib -lf77blas -latlas" --with-blas="-L${openblas}/lib -lopenblas"
--with-lapack="-L${liblapack}/lib -llapack" --with-lapack="-L${openblas}/lib -lopenblas"
--with-readline --with-readline
--with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh"
--with-cairo --with-cairo

1
pkgs/top-level/all-packages.nix
View File

@ -8556,6 +8556,7 @@ let
R = callPackage ../applications/science/math/R { R = callPackage ../applications/science/math/R {
inherit (xlibs) libX11 libXt; inherit (xlibs) libX11 libXt;
texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; };
openblas = openblasCompat;
withRecommendedPackages = false; withRecommendedPackages = false;
}; };