diff options
Diffstat (limited to 'pkgs/development/r-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/r-modules/generic-builder.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index a66468358b6a..3958128867e6 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,14 +1,14 @@ -{ 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]; env.NIX_CFLAGS_COMPILE = - lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; configurePhase = '' runHook preConfigure @@ -29,14 +29,14 @@ 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"; installPhase = '' runHook preInstall mkdir -p $out/library - $rCommand CMD INSTALL $installFlags --configure-args="$configureFlags" -l $out/library . + $rCommand CMD INSTALL "''${installFlags[@]}" --configure-args="''${configureFlags[@]}" -l $out/library . runHook postInstall ''; |