From 9eb60bee0e6d30025b74ed1c9e87108a5798019e Mon Sep 17 00:00:00 2001
From: Dominic Steinitz <dominic@steinitz.org>
Date: Fri, 26 Mar 2021 18:18:42 +0000
Subject: [PATCH 1/2] Fix https://github.com/NixOS/nixpkgs/issues/117715

---
 pkgs/applications/science/math/R/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 331faa6b1479..7f238cc1cd9c 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -51,6 +51,7 @@ 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

From 732ab3d4e2eaa39fb52b15ff7f7a40978725dc77 Mon Sep 17 00:00:00 2001
From: Dominic Steinitz <dominic@steinitz.org>
Date: Thu, 29 Apr 2021 17:34:34 +0100
Subject: [PATCH 2/2] 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 7f238cc1cd9c..8905df8ccef9 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"