diff options
| author | mimadrid <mimadrid@ucm.es> | 2017-01-06 17:11:23 +0100 |
|---|---|---|
| committer | mimadrid <mimadrid@ucm.es> | 2017-01-06 21:05:46 +0100 |
| commit | 6f9124e11860095d90515e7fb8f702f1779b3fe8 (patch) | |
| tree | af0fa3b69ac980d493e2981ed433a30c4357c2fd /pkgs/development/r-modules/default.nix | |
| parent | 6d3183e7daa07d730d644803b842c0696e02f01e (diff) | |
| download | nixpkgs-6f9124e11860095d90515e7fb8f702f1779b3fe8.tar nixpkgs-6f9124e11860095d90515e7fb8f702f1779b3fe8.tar.gz nixpkgs-6f9124e11860095d90515e7fb8f702f1779b3fe8.tar.bz2 nixpkgs-6f9124e11860095d90515e7fb8f702f1779b3fe8.tar.lz nixpkgs-6f9124e11860095d90515e7fb8f702f1779b3fe8.tar.xz nixpkgs-6f9124e11860095d90515e7fb8f702f1779b3fe8.tar.zst nixpkgs-6f9124e11860095d90515e7fb8f702f1779b3fe8.zip | |
r-modules: fix Cairo package
Diffstat (limited to 'pkgs/development/r-modules/default.nix')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 093bc2f7884..529c6db091d 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -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"; }); |