diff options
author | Tom Hall <tahall256@protonmail.ch> | 2018-11-03 20:27:41 +0000 |
---|---|---|
committer | Tom Hall <tahall256@protonmail.ch> | 2018-11-10 20:53:26 +0000 |
commit | b51018ed2ed174c7fa0be3d68aca2f0b51656e7d (patch) | |
tree | 0f01a7b2a7d61a290062acbce24a998e05e07183 /pkgs/applications/science/math/R | |
parent | eb6337b3e3c0b4fca90aaf3f75c4558408e0fb16 (diff) | |
download | nixlib-b51018ed2ed174c7fa0be3d68aca2f0b51656e7d.tar nixlib-b51018ed2ed174c7fa0be3d68aca2f0b51656e7d.tar.gz nixlib-b51018ed2ed174c7fa0be3d68aca2f0b51656e7d.tar.bz2 nixlib-b51018ed2ed174c7fa0be3d68aca2f0b51656e7d.tar.lz nixlib-b51018ed2ed174c7fa0be3d68aca2f0b51656e7d.tar.xz nixlib-b51018ed2ed174c7fa0be3d68aca2f0b51656e7d.tar.zst nixlib-b51018ed2ed174c7fa0be3d68aca2f0b51656e7d.zip |
R: Remove jdk dependency on aarch32/64
Add javaSupport as an argument for R. Default to false on arm as there is no free jdk on arm.
Diffstat (limited to 'pkgs/applications/science/math/R')
-rw-r--r-- | pkgs/applications/science/math/R/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 913fac6ac128..2fa8f3e5d7be 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -4,6 +4,7 @@ , curl, Cocoa, Foundation, libobjc, libcxx, tzdata , withRecommendedPackages ? true , enableStrictBarrier ? false +, javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64) }: stdenv.mkDerivation rec { @@ -17,9 +18,10 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre perl readline texLive xz zlib less texinfo graphviz icu - pkgconfig bison imake which jdk openblas curl + pkgconfig bison imake which openblas curl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ] + ++ stdenv.lib.optional javaSupport jdk; patches = [ ./no-usr-local-search-paths.patch ]; @@ -47,7 +49,7 @@ stdenv.mkDerivation rec { CC=$(type -p cc) CXX=$(type -p c++) FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" - JAVA_HOME="${jdk}" + ${stdenv.lib.optionalString javaSupport "JAVA_HOME=\"${jdk}\""} RANLIB=$(type -p ranlib) R_SHELL="${stdenv.shell}" '' + stdenv.lib.optionalString stdenv.isDarwin '' |