From e729a88474da9e6cccd111a5f7c71f164ab8d784 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 4 Jun 2015 16:49:04 -0500 Subject: [PATCH] R: build with openblas Fixes #6393. --- pkgs/applications/science/math/R/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 6 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e96c04b7d83..9f95e32e9511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8556,6 +8556,7 @@ let R = callPackage ../applications/science/math/R { inherit (xlibs) libX11 libXt; texLive = texLiveAggregationFun { paths = [ texLive texLiveExtra ]; }; + openblas = openblasCompat; withRecommendedPackages = false; };