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 | |
| parent | 621d1ab4444c4bf8830c9fd0810407fda186db36 (diff) | |
| download | nixpkgs-0f9c0348af199f9baed6585be0502ad61c6f7e04.tar nixpkgs-0f9c0348af199f9baed6585be0502ad61c6f7e04.tar.gz nixpkgs-0f9c0348af199f9baed6585be0502ad61c6f7e04.tar.bz2 nixpkgs-0f9c0348af199f9baed6585be0502ad61c6f7e04.tar.lz nixpkgs-0f9c0348af199f9baed6585be0502ad61c6f7e04.tar.xz nixpkgs-0f9c0348af199f9baed6585be0502ad61c6f7e04.tar.zst nixpkgs-0f9c0348af199f9baed6585be0502ad61c6f7e04.zip | |
rPackages: remove Xvfb where it's not needed
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 4 | ||||
| -rw-r--r-- | 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 |