rPackages: remove Xvfb where it's not needed

2015-02-19 23:49:41 +03:00
parent 621d1ab444
commit 0f9c0348af
2 changed files with 6 additions and 5 deletions
@@ -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