diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 20:21:58 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-16 17:58:11 +0700 |
| commit | badf51221db8fae81bf9948c39eaf8342dfd5597 (patch) | |
| tree | 34eeb35ca97f0b081da465e9ddd6c120a9d2b7df /pkgs/applications/science/math/R/default.nix | |
| parent | a9bb54359eeedf2594fdf191de5b673fd1dd102d (diff) | |
treewide: stdenv.lib -> lib
Diffstat (limited to 'pkgs/applications/science/math/R/default.nix')
| -rw-r--r-- | pkgs/applications/science/math/R/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 2191511a9c57c..d9fbc626e009a 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -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" |