diff options
| author | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2018-08-03 01:06:36 +0900 |
|---|---|---|
| committer | Mitsuhiro Nakamura <m.nacamura@gmail.com> | 2018-08-03 01:08:35 +0900 |
| commit | 0a541aa38c47108bffb1c78cef0e09e125cc6023 (patch) | |
| tree | e98e044deaf9570164b7c5796e3b42115c00dab9 /pkgs/development/r-modules | |
| parent | 559997179d612b57bbf8ad0f230235d8c34ae36d (diff) | |
| download | nixlib-0a541aa38c47108bffb1c78cef0e09e125cc6023.tar nixlib-0a541aa38c47108bffb1c78cef0e09e125cc6023.tar.gz nixlib-0a541aa38c47108bffb1c78cef0e09e125cc6023.tar.bz2 nixlib-0a541aa38c47108bffb1c78cef0e09e125cc6023.tar.lz nixlib-0a541aa38c47108bffb1c78cef0e09e125cc6023.tar.xz nixlib-0a541aa38c47108bffb1c78cef0e09e125cc6023.tar.zst nixlib-0a541aa38c47108bffb1c78cef0e09e125cc6023.zip | |
rPackages.buildRPackage: fix error if requireX is missing
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/generic-builder.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 0d731de33f84..76bf29abc17c 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -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" |