treewide: stdenv.lib -> lib
This commit is contained in:
@@ -25,14 +25,14 @@ stdenv.mkDerivation rec {
|
||||
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
|
||||
pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu
|
||||
pkgconfig bison imake which blas lapack curl tcl tk jdk
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
|
||||
] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
|
||||
|
||||
patches = [
|
||||
./no-usr-local-search-paths.patch
|
||||
./fix-failing-test.patch
|
||||
];
|
||||
|
||||
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
prePatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace configure --replace "-install_name libR.dylib" "-install_name $out/lib/R/lib/libR.dylib"
|
||||
'';
|
||||
|
||||
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = ''
|
||||
configureFlagsArray=(
|
||||
--disable-lto
|
||||
--with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages
|
||||
--with${lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages
|
||||
--with-blas="-L${blas}/lib -lblas"
|
||||
--with-lapack="-L${lapack}/lib -llapack"
|
||||
--with-readline
|
||||
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
--with-jpeglib
|
||||
--with-libtiff
|
||||
--with-ICU
|
||||
${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"}
|
||||
${lib.optionalString enableStrictBarrier "--enable-strict-barrier"}
|
||||
${if static then "--enable-R-static-lib" else "--enable-R-shlib"}
|
||||
AR=$(type -p ar)
|
||||
AWK=$(type -p gawk)
|
||||
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||
JAVA_HOME="${jdk}"
|
||||
RANLIB=$(type -p ranlib)
|
||||
R_SHELL="${stdenv.shell}"
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
--disable-R-framework
|
||||
OBJC="clang"
|
||||
CPPFLAGS="-isystem ${libcxx}/include/c++/v1"
|
||||
|
||||
Reference in New Issue
Block a user