diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/science/math/R/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/science/math/R/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/applications/science/math/R/default.nix b/nixpkgs/pkgs/applications/science/math/R/default.nix index a791f9a57727..517fc9d7b320 100644 --- a/nixpkgs/pkgs/applications/science/math/R/default.nix +++ b/nixpkgs/pkgs/applications/science/math/R/default.nix @@ -4,15 +4,18 @@ , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false +# R as of writing does not support outputting both .so and .a files; it outputs: +# --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored +, static ? false , javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64) }: stdenv.mkDerivation rec { - name = "R-3.6.1"; + name = "R-3.6.2"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "128kifbq0w25y8aq77w289ddax5i5w2djcfsqgffrb3i7syrxajv"; + sha256 = "0m69pfi0nxyriyb2yz74xfzaxwfkinnf9kpvf1rz727vvmfa8rdx"; }; dontUseImakeConfigure = true; @@ -20,9 +23,8 @@ 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 openblas curl - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ] + pkgconfig bison imake which openblas curl tcl tk + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ] ++ stdenv.lib.optional javaSupport jdk; patches = [ @@ -33,6 +35,8 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib" ''; + dontDisableStatic = static; + preConfigure = '' configureFlagsArray=( --disable-lto @@ -47,7 +51,7 @@ stdenv.mkDerivation rec { --with-libtiff --with-ICU ${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"} - --enable-R-shlib + ${if static then "--enable-R-static-lib" else "--enable-R-shlib"} AR=$(type -p ar) AWK=$(type -p gawk) CC=$(type -p cc) @@ -57,8 +61,6 @@ stdenv.mkDerivation rec { RANLIB=$(type -p ranlib) R_SHELL="${stdenv.shell}" '' + stdenv.lib.optionalString stdenv.isDarwin '' - --without-tcltk - --without-aqua --disable-R-framework OBJC="clang" CPPFLAGS="-isystem ${libcxx}/include/c++/v1" |