b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

rPackages.buildRPackage: fix error if requireX is missing

Browse source
This commit is contained in:
Mitsuhiro Nakamura 2018-08-03 01:06:36 +09:00
parent 559997179d
commit 0a541aa38c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/r-modules/generic-builder.nix
View file

@ -1,10 +1,10 @@
{ stdenv, R, libcxx, xvfb_run, utillinux, Cocoa, Foundation, gettext, gfortran }:
{ name, buildInputs ? [], ... } @ attrs:
{ name, buildInputs ? [], requireX ? false, ... } @ attrs:
stdenv.mkDerivation ({
buildInputs = buildInputs ++ [R gettext] ++
stdenv.lib.optionals attrs.requireX [utillinux xvfb_run] ++
stdenv.lib.optionals requireX [utillinux xvfb_run] ++
stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];
NIX_CFLAGS_COMPILE =
@ -26,7 +26,7 @@ stdenv.mkDerivation ({
else
[ "--no-test-load" ];
rCommand = if attrs.requireX or false then
rCommand = if requireX then
# Unfortunately, xvfb-run has a race condition even with -a option, so that
# we acquire a lock explicitly.
"flock ${xvfb_run} xvfb-run -a -e xvfb-error R"