cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #67948 from cfhammill/master

Browse source 
Fix broken builds for rgdal and sf R packages
This commit is contained in:
Peter Simons 2019-09-02 16:33:49 +02:00 committed by GitHub
commit 22fb5e57f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/r-modules/default.nix
View file

@ -308,7 +308,7 @@ let
RcppGSL = [ pkgs.gsl_1 ]; RcppGSL = [ pkgs.gsl_1 ];
RcppZiggurat = [ pkgs.gsl_1 ]; RcppZiggurat = [ pkgs.gsl_1 ];
reprex = [ pkgs.which ]; reprex = [ pkgs.which ];
rgdal = [ pkgs.proj pkgs.gdal ]; rgdal = [ pkgs.proj.dev pkgs.gdal ];
rgeos = [ pkgs.geos ]; rgeos = [ pkgs.geos ];
rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ]; rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ];
rgl = [ pkgs.libGLU_combined pkgs.xlibsWrapper ]; rgl = [ pkgs.libGLU_combined pkgs.xlibsWrapper ];
@ -420,7 +420,7 @@ let
odbc = [ pkgs.pkgconfig ]; odbc = [ pkgs.pkgconfig ];
openssl = [ pkgs.pkgconfig ]; openssl = [ pkgs.pkgconfig ];
pdftools = [ pkgs.pkgconfig ]; pdftools = [ pkgs.pkgconfig ];
sf = [ pkgs.pkgconfig ]; sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ];
showtext = [ pkgs.pkgconfig ]; showtext = [ pkgs.pkgconfig ];
spate = [ pkgs.pkgconfig ]; spate = [ pkgs.pkgconfig ];
stringi = [ pkgs.pkgconfig ]; stringi = [ pkgs.pkgconfig ];