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

r-modules: fix Cairo package

Browse Source
This commit is contained in:
mimadrid 2017-01-06 17:11:23 +01:00
parent 6d3183e7da
commit 6f9124e118
No known key found for this signature in database
GPG Key ID: 4D0F6894D41C6957
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/r-modules/default.nix
View File

@ -247,7 +247,7 @@ let
bnpmr = [ pkgs.gsl_1 ];
BNSP = [ pkgs.gsl_1 ];
cairoDevice = [ pkgs.gtk2 ];
Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo ];
Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ];
Cardinal = [ pkgs.which ];
chebpol = [ pkgs.fftw ];
ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
@ -1791,6 +1791,10 @@ let
'';
});
Cairo = old.Cairo.overrideDerivation (attrs: {
NIX_LDFLAGS = "-lfontconfig";
});
curl = old.curl.overrideDerivation (attrs: {
preConfigure = "patchShebangs configure";
});