diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-02-19 23:49:41 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-02-19 23:49:41 +0300 |
| commit | 0f9c0348af199f9baed6585be0502ad61c6f7e04 (patch) | |
| tree | 6372d657da271680a7e9fcdb566306ee20807ddf /pkgs/development/r-modules/generic-builder.nix | |
| parent | 621d1ab4444c4bf8830c9fd0810407fda186db36 (diff) | |
rPackages: remove Xvfb where it's not needed
Diffstat (limited to 'pkgs/development/r-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/r-modules/generic-builder.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index bca7c10e0fd2..45c377635c90 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 |