diff options
author | Dominic Steinitz <dominic@steinitz.org> | 2021-04-29 17:34:34 +0100 |
---|---|---|
committer | Dominic Steinitz <dominic@steinitz.org> | 2021-04-29 17:34:34 +0100 |
commit | 732ab3d4e2eaa39fb52b15ff7f7a40978725dc77 (patch) | |
tree | e37843e2fb5e35fbc25d6b0c09ae5ef594726836 /pkgs/applications/science/math | |
parent | 9eb60bee0e6d30025b74ed1c9e87108a5798019e (diff) |
Incorporate suggeston by collares
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/R/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 7f238cc1cd9c5..8905df8ccef9f 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation rec { --with-readline --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-cairo - --without-x --with-libpng --with-jpeglib --with-libtiff @@ -68,6 +67,7 @@ stdenv.mkDerivation rec { R_SHELL="${stdenv.shell}" '' + lib.optionalString stdenv.isDarwin '' --disable-R-framework + --without-x OBJC="clang" CPPFLAGS="-isystem ${libcxx}/include/c++/v1" LDFLAGS="-L${libcxx}/lib" |