git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #50179 from Thra11/r-without-jdk

R: Remove jdk dependency on aarch32/64

commit22a802584f1a77acfbb82ae6d04dc72c10d4fdd7 authorPeter Simons <simons@cryp.to> dateMon 12 Nov 2018, 12:42 (8 years ago) parentadb5b61b51018e
1 file changed+5−3
pkgs/applications/science/math/R/default.nix+5−3
pkgs/applications/science/math/R/default.nix+5−3
@@ -4,6 +4,7 @@
44, curl, Cocoa, Foundation, libobjc, libcxx, tzdata
55, withRecommendedPackages ? true
66, enableStrictBarrier ? false
7+, javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64)
78}:
89
910stdenv.mkDerivation rec {
@@ -17,9 +18,10 @@ stdenv.mkDerivation rec {
1718 buildInputs = [
1819 bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
1920 pango pcre perl readline texLive xz zlib less texinfo graphviz icu
20− pkgconfig bison imake which jdk openblas curl
21+ pkgconfig bison imake which openblas curl
2122 ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
22− ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
23+ ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]
24+ ++ stdenv.lib.optional javaSupport jdk;
2325
2426 patches = [ ./no-usr-local-search-paths.patch ];
2527
@@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
4749 CC=$(type -p cc)
4850 CXX=$(type -p c++)
4951 FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
50− JAVA_HOME="${jdk}"
52+ ${stdenv.lib.optionalString javaSupport "JAVA_HOME=\"${jdk}\""}
5153 RANLIB=$(type -p ranlib)
5254 R_SHELL="${stdenv.shell}"
5355 '' + stdenv.lib.optionalString stdenv.isDarwin ''