diff options
| author | Peter Simons <simons@cryp.to> | 2021-01-18 08:30:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 08:30:44 +0100 |
| commit | 156071bfc8214c192e357f6d231e3db0ec81d352 (patch) | |
| tree | b11dcbe56850f024bceeead44fe9bca50599f8c6 /pkgs | |
| parent | f9ced01f4ac5c269e2ce73ec629cad115b0c725d (diff) | |
| parent | 364de6ddd2a9f4508ba4375668221b930aa9fc73 (diff) | |
| download | nixlib-156071bfc8214c192e357f6d231e3db0ec81d352.tar nixlib-156071bfc8214c192e357f6d231e3db0ec81d352.tar.gz nixlib-156071bfc8214c192e357f6d231e3db0ec81d352.tar.bz2 nixlib-156071bfc8214c192e357f6d231e3db0ec81d352.tar.lz nixlib-156071bfc8214c192e357f6d231e3db0ec81d352.tar.xz nixlib-156071bfc8214c192e357f6d231e3db0ec81d352.tar.zst nixlib-156071bfc8214c192e357f6d231e3db0ec81d352.zip | |
Merge pull request #109706 from PhDyellow/master_plus_patches_2
r-modules: fix clustermq and rzmq build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 5492874efda1..362e7b81da4e 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -329,7 +329,8 @@ let rtiff = [ pkgs.libtiff.dev ]; runjags = [ pkgs.jags ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; - rzmq = [ pkgs.zeromq ]; + rzmq = [ pkgs.zeromq pkgs.pkgconfig ]; + clustermq = [ pkgs.zeromq ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; sdcTable = [ pkgs.gmp pkgs.glpk ]; seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; @@ -384,6 +385,7 @@ let nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; + clustermq = [ pkgs.pkgconfig ]; RMark = [ pkgs.which ]; RPushbullet = [ pkgs.which ]; RcppEigen = [ pkgs.libiconv ]; @@ -663,6 +665,14 @@ let ''; }); + rzmq = old.rzmq.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + + clustermq = old.clustermq.overrideDerivation (attrs: { + preConfigure = "patchShebangs configure"; + }); + Cairo = old.Cairo.overrideDerivation (attrs: { NIX_LDFLAGS = "-lfontconfig"; }); |