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

pkgs/development: stdenv.lib -> lib

Browse Source 
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
This commit is contained in:
Pavol Rusnak
2021-01-17 19:11:59 +01:00
parent 979e6e67d3
commit cf2a67fef3
18 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/r-modules/generic-builder.nix
View File

@@ -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