diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2021-01-17 19:11:59 +0100 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2021-01-17 19:11:59 +0100 |
| commit | cf2a67fef385d021ced8a63048c0cf88f2d8dbc5 (patch) | |
| tree | 023d243734d46147fd7738d3ef353b3dbd76a5ac /pkgs/development/r-modules | |
| parent | 979e6e67d32a934dcc39dedfd588baf6e3f7ed78 (diff) | |
| download | nixlib-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar nixlib-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar.gz nixlib-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar.bz2 nixlib-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar.lz nixlib-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar.xz nixlib-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.tar.zst nixlib-cf2a67fef385d021ced8a63048c0cf88f2d8dbc5.zip | |
pkgs/development: stdenv.lib -> lib
this takes care of the following folders in pkgs/development: * arduino * chez-modules * go-packages * guile-modules * idris-modules * perl-modules * r-modules * ruby-modules
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/generic-builder.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index 3adb84a0ba58..1e96a64a5e28 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -1,14 +1,14 @@ -{ stdenv, 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] ++ - stdenv.lib.optionals requireX [util-linux xvfb_run] ++ - stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; + lib.optionals requireX [util-linux xvfb_run] ++ + lib.optionals stdenv.isDarwin [Cocoa Foundation gfortran]; NIX_CFLAGS_COMPILE = - stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; configurePhase = '' runHook preConfigure |