diff options
author | Peter Simons <simons@cryp.to> | 2018-02-07 08:31:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-07 08:31:10 +0100 |
commit | fa23ff4a7d1439862bc830423c37cc9ec0e0191c (patch) | |
tree | ee969169cc2d417cb9ed9e24b8189ce95f5d7014 /pkgs/applications/science/math | |
parent | 725e98fe856a06cd2e3f5298041341b6fe42a1ed (diff) | |
parent | f4a031c63f3684544cdb08da1df5d9a6d8cb40e8 (diff) | |
download | nixlib-fa23ff4a7d1439862bc830423c37cc9ec0e0191c.tar nixlib-fa23ff4a7d1439862bc830423c37cc9ec0e0191c.tar.gz nixlib-fa23ff4a7d1439862bc830423c37cc9ec0e0191c.tar.bz2 nixlib-fa23ff4a7d1439862bc830423c37cc9ec0e0191c.tar.lz nixlib-fa23ff4a7d1439862bc830423c37cc9ec0e0191c.tar.xz nixlib-fa23ff4a7d1439862bc830423c37cc9ec0e0191c.tar.zst nixlib-fa23ff4a7d1439862bc830423c37cc9ec0e0191c.zip |
Merge pull request #34651 from mnacamura/r-darwin-libcxx
R: add libcxx to default LDFLAGS and CPPFLAGS on Darwin
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/R/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 725b3f342c3e..7bd19cfc520e 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas -, curl, Cocoa, Foundation, cf-private, libobjc, tzdata, fetchpatch +, curl, Cocoa, Foundation, cf-private, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pango pcre perl readline texLive xz zlib less texinfo graphviz icu pkgconfig bison imake which jdk openblas curl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch ]; @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { --without-aqua --disable-R-framework OBJC="clang" + CPPFLAGS="-isystem ${libcxx}/include/c++/v1" + LDFLAGS="-L${libcxx}/lib" '' + '' ) echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib" |