From 732ab3d4e2eaa39fb52b15ff7f7a40978725dc77 Mon Sep 17 00:00:00 2001 From: Dominic Steinitz Date: Thu, 29 Apr 2021 17:34:34 +0100 Subject: [PATCH] Incorporate suggeston by collares --- pkgs/applications/science/math/R/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 7f238cc1cd9..8905df8ccef 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"