From 0f9c0348af199f9baed6585be0502ad61c6f7e04 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 19 Feb 2015 23:49:41 +0300
Subject: [PATCH] rPackages: remove Xvfb where it's not needed

---
 pkgs/development/r-modules/default.nix         | 4 ++--
 pkgs/development/r-modules/generic-builder.nix | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 0bb02d0f989..1d23bb692cf 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -3,9 +3,9 @@
 { R, pkgs, overrides }:
 
 let
-  inherit (pkgs) fetchurl stdenv lib xvfb_run utillinux;
+  inherit (pkgs) fetchurl stdenv lib;
 
-  buildRPackage = import ./generic-builder.nix { inherit R xvfb_run utillinux ; };
+  buildRPackage = pkgs.callPackage ./generic-builder.nix { inherit R; };
 
   # Package template
   #
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix
index bca7c10e0fd..45c377635c9 100644
--- a/pkgs/development/r-modules/generic-builder.nix
+++ b/pkgs/development/r-modules/generic-builder.nix
@@ -1,9 +1,10 @@
-{ R, xvfb_run, utillinux }:
+{ stdenv, R, xvfb_run, utillinux }:
 
 { name, buildInputs ? [], ... } @ attrs:
 
-R.stdenv.mkDerivation ({
-  buildInputs = buildInputs ++ [R xvfb_run utillinux];
+stdenv.mkDerivation ({
+  buildInputs = buildInputs ++ [R] ++
+                stdenv.lib.optionals attrs.requireX [utillinux xvfb_run];
 
   configurePhase = ''
     runHook preConfigure