JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rPackages: remove Xvfb where it's not needed

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-02-19 23:49:41 +03:00
parent 621d1ab444
commit 0f9c0348af
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/r-modules/default.nix
View File

@ -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
#

7
pkgs/development/r-modules/generic-builder.nix
View File

@ -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