diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-11-07 16:49:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 16:49:46 -0500 |
| commit | 551d9f632d38da2a8c550e95812fe3bef7c858f7 (patch) | |
| tree | 84bf8118b7b1132d18efc5b9af1535038fbe991c /pkgs/applications/science/math | |
| parent | a6d3df106c0db76d6186847a1d203b840ab01143 (diff) | |
| parent | 22d0ccbd2d005a71224d30fd88896947895b6c68 (diff) | |
| download | nixlib-551d9f632d38da2a8c550e95812fe3bef7c858f7.tar nixlib-551d9f632d38da2a8c550e95812fe3bef7c858f7.tar.gz nixlib-551d9f632d38da2a8c550e95812fe3bef7c858f7.tar.bz2 nixlib-551d9f632d38da2a8c550e95812fe3bef7c858f7.tar.lz nixlib-551d9f632d38da2a8c550e95812fe3bef7c858f7.tar.xz nixlib-551d9f632d38da2a8c550e95812fe3bef7c858f7.tar.zst nixlib-551d9f632d38da2a8c550e95812fe3bef7c858f7.zip | |
Merge pull request #72954 from nkpart/nkpart/R-darwin-enable-tcltk
R: enable tcltk on darwin
Diffstat (limited to 'pkgs/applications/science/math')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index bc0f7ed88316..a66cd3e8d7e1 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -23,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 = [ @@ -62,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" |