git.iko.soy/typeable/nixpkgs
on master help sign in
R: Enable java support on all platforms
commit4e5aeca90bba12fb23e87e63dfedbd0890bc6139 authorTom Hall <tahall256@protonmail.ch> dateWed 19 Feb 2020, 22:57 (7 years ago) parent0eb33b0
1 file changed+3−5
pkgs/applications/science/math/R/default.nix+3−5
pkgs/applications/science/math/R/default.nix+3−5
@@ -7,7 +7,6 @@
77# R as of writing does not support outputting both .so and .a files; it outputs:
88# --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored
99, static ? false
10−, javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64)
1110}:
1211
1312stdenv.mkDerivation rec {
@@ -23,9 +22,8 @@ stdenv.mkDerivation rec {
2322 buildInputs = [
2423 bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
2524 pango pcre perl readline texLive xz zlib less texinfo graphviz icu
26− pkgconfig bison imake which openblas curl tcl tk
27− ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]
28− ++ stdenv.lib.optional javaSupport jdk;
25+ pkgconfig bison imake which openblas curl tcl tk jdk
26+ ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
2927
3028 patches = [
3129 ./no-usr-local-search-paths.patch
@@ -57,7 +55,7 @@ stdenv.mkDerivation rec {
5755 CC=$(type -p cc)
5856 CXX=$(type -p c++)
5957 FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
60− ${stdenv.lib.optionalString javaSupport "JAVA_HOME=\"${jdk}\""}
58+ JAVA_HOME="${jdk}"
6159 RANLIB=$(type -p ranlib)
6260 R_SHELL="${stdenv.shell}"
6361 '' + stdenv.lib.optionalString stdenv.isDarwin ''