r-modules: fix clustermq and rzmq build
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:
@@ -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";
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user