public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72954 from nkpart/nkpart/R-darwin-enable-tcltk

Browse Source 
R: enable tcltk on darwin
This commit is contained in:
Matthew Bauer
2019-11-07 16:49:46 -05:00
committed by GitHub
parent a6d3df106c 22d0ccbd2d
commit 551d9f632d
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/math/R/default.nix
+2 -5
View File
@@ -23,9 +23,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
pango pcre perl readline texLive xz zlib less texinfo graphviz icu pango pcre perl readline texLive xz zlib less texinfo graphviz icu
pkgconfig bison imake which openblas curl pkgconfig bison imake which openblas curl tcl tk
] ++ 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; ++ stdenv.lib.optional javaSupport jdk;
patches = [ patches = [
@@ -62,8 +61,6 @@ stdenv.mkDerivation rec {
RANLIB=$(type -p ranlib) RANLIB=$(type -p ranlib)
R_SHELL="${stdenv.shell}" R_SHELL="${stdenv.shell}"
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''
--without-tcltk
--without-aqua
--disable-R-framework --disable-R-framework
OBJC="clang" OBJC="clang"
CPPFLAGS="-isystem ${libcxx}/include/c++/v1" CPPFLAGS="-isystem ${libcxx}/include/c++/v1"