diff options
| author | Peter Simons <simons@cryp.to> | 2018-02-09 17:43:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 17:43:03 +0100 |
| commit | 9861064f35923250991a523bc8c274fad3a100d8 (patch) | |
| tree | 61cf6f6c5460dd60e4be7cf64d8ba38114e0a199 | |
| parent | 7d9313fff3bbe4c3fd04ea718aa921b1a6c44ab4 (diff) | |
| parent | c4658ac0a4ebb8a5a5f5fd4305479d9f3ee7f714 (diff) | |
| download | nixlib-9861064f35923250991a523bc8c274fad3a100d8.tar nixlib-9861064f35923250991a523bc8c274fad3a100d8.tar.gz nixlib-9861064f35923250991a523bc8c274fad3a100d8.tar.bz2 nixlib-9861064f35923250991a523bc8c274fad3a100d8.tar.lz nixlib-9861064f35923250991a523bc8c274fad3a100d8.tar.xz nixlib-9861064f35923250991a523bc8c274fad3a100d8.tar.zst nixlib-9861064f35923250991a523bc8c274fad3a100d8.zip | |
Merge pull request #34766 from mnacamura/r-pbdZMQ-fix-darwin
rPackages.pbdZMQ: fix package loading on Darwin
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 4510308d3e56..ee1fb24b3098 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -285,7 +285,7 @@ let pbdMPI = [ pkgs.openmpi ]; pbdNCDF4 = [ pkgs.netcdf ]; pbdPROF = [ pkgs.openmpi ]; - pbdZMQ = [ pkgs.which ]; + pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.which ]; pdftools = [ pkgs.poppler.dev ]; PKI = [ pkgs.openssl.dev ]; png = [ pkgs.libpng.dev ]; @@ -393,6 +393,7 @@ let nat = [ pkgs.which ]; nat_nblast = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; + pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; qtpaint = [ pkgs.cmake ]; @@ -776,6 +777,14 @@ let PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; }); + pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: { + postPatch = lib.optionalString stdenv.isDarwin '' + for file in R/*.{r,r.in}; do + sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file + done + ''; + }); + qtbase = old.qtbase.overrideDerivation (attrs: { patches = [ ./patches/qtbase.patch ]; }); |