Merge pull request #109706 from PhDyellow/master_plus_patches_2

r-modules: fix clustermq and rzmq build

authored by Peter Simons and committed by GitHub 156071bf f9ced01f

+11 -1
+11 -1
pkgs/development/r-modules/default.nix
··· 329 329 rtiff = [ pkgs.libtiff.dev ]; 330 330 runjags = [ pkgs.jags ]; 331 331 RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; 332 - rzmq = [ pkgs.zeromq ]; 332 + rzmq = [ pkgs.zeromq pkgs.pkgconfig ]; 333 + clustermq = [ pkgs.zeromq ]; 333 334 SAVE = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.pcre ]; 334 335 sdcTable = [ pkgs.gmp pkgs.glpk ]; 335 336 seewave = [ pkgs.fftw.dev pkgs.libsndfile.dev ]; ··· 384 385 nat = [ pkgs.which ]; 385 386 nat_templatebrains = [ pkgs.which ]; 386 387 pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ]; 388 + clustermq = [ pkgs.pkgconfig ]; 387 389 RMark = [ pkgs.which ]; 388 390 RPushbullet = [ pkgs.which ]; 389 391 RcppEigen = [ pkgs.libiconv ]; ··· 661 663 export LIBXML_INCDIR=${pkgs.libxml2.dev}/include/libxml2 662 664 patchShebangs configure 663 665 ''; 666 + }); 667 + 668 + rzmq = old.rzmq.overrideDerivation (attrs: { 669 + preConfigure = "patchShebangs configure"; 670 + }); 671 + 672 + clustermq = old.clustermq.overrideDerivation (attrs: { 673 + preConfigure = "patchShebangs configure"; 664 674 }); 665 675 666 676 Cairo = old.Cairo.overrideDerivation (attrs: {