public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r-modules: fix clustermq and rzmq build

Browse Source 
rzmq uses pkgconfig.

clustermq now incorporates ZMQ libs directly, rather than using
the rzmq package. clustermq now uses zeromq and pkgconfig.

Both packages needed patchShebangs, due to pkgconfig.
This commit is contained in:
Phil Dyer
2021-01-18 15:30:28 +10:00
parent abaefba36c
commit 364de6ddd2
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/r-modules/default.nix
+11 -1
View File
@@ -329,7 +329,8 @@ let
rtiff = [ pkgs.libtiff.dev ]; rtiff = [ pkgs.libtiff.dev ];
runjags = [ pkgs.jags ]; runjags = [ pkgs.jags ];
RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; 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 ]; SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ];
sdcTable = [ pkgs.gmp pkgs.glpk ]; sdcTable = [ pkgs.gmp pkgs.glpk ];
seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ];
@@ -384,6 +385,7 @@ let
nat = [ pkgs.which ]; nat = [ pkgs.which ];
nat_templatebrains = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ];
pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
clustermq = [ pkgs.pkgconfig ];
RMark = [ pkgs.which ]; RMark = [ pkgs.which ];
RPushbullet = [ pkgs.which ]; RPushbullet = [ pkgs.which ];
RcppEigen = [ pkgs.libiconv ]; 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: { Cairo = old.Cairo.overrideDerivation (attrs: {
NIX_LDFLAGS = "-lfontconfig"; NIX_LDFLAGS = "-lfontconfig";
}); });