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

Incorporate suggeston by collares

Browse Source
This commit is contained in:
Dominic Steinitz 2021-04-29 17:34:34 +01:00
parent 9eb60bee0e
commit 732ab3d4e2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/science/math/R/default.nix
View File

@ -51,7 +51,6 @@ stdenv.mkDerivation rec {
--with-readline --with-readline
--with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh"
--with-cairo --with-cairo
--without-x
--with-libpng --with-libpng
--with-jpeglib --with-jpeglib
--with-libtiff --with-libtiff
@ -68,6 +67,7 @@ stdenv.mkDerivation rec {
R_SHELL="${stdenv.shell}" R_SHELL="${stdenv.shell}"
'' + lib.optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''
--disable-R-framework --disable-R-framework
--without-x
OBJC="clang" OBJC="clang"
CPPFLAGS="-isystem ${libcxx}/include/c++/v1" CPPFLAGS="-isystem ${libcxx}/include/c++/v1"
LDFLAGS="-L${libcxx}/lib" LDFLAGS="-L${libcxx}/lib"