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

Merge pull request #109706 from PhDyellow/master_plus_patches_2

Browse Source 
r-modules: fix clustermq and rzmq build
This commit is contained in:
Peter Simons 2021-01-18 08:30:44 +01:00 committed by GitHub
commit 156071bfc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/r-modules/default.nix
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";
}); });