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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-08 18:22:46 +00:00
committed by GitHub
parent 20549cae36 094283528b
commit 6d46d8a9b9
86 changed files with 1267 additions and 220 deletions
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, lib, R, libcxx, xvfb_run, util-linux, Cocoa, Foundation, gettext, gfortran }:
{ stdenv, lib, R, libcxx, xvfb-run, util-linux, Cocoa, Foundation, gettext, gfortran }:
{ name, buildInputs ? [], requireX ? false, ... } @ attrs:
stdenv.mkDerivation ({
buildInputs = buildInputs ++ [R gettext] ++
lib.optionals requireX [util-linux xvfb_run] ++
lib.optionals requireX [util-linux xvfb-run] ++
lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran];
NIX_CFLAGS_COMPILE =
@@ -29,7 +29,7 @@ stdenv.mkDerivation ({
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"
"flock ${xvfb-run} xvfb-run -a -e xvfb-error R"
else
"R";