mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-16 09:03:42 +00:00
Merge pull request #67948 from cfhammill/master
Fix broken builds for rgdal and sf R packages
This commit is contained in:
commit
22fb5e57f7
@ -308,7 +308,7 @@ let
|
||||
RcppGSL = [ pkgs.gsl_1 ];
|
||||
RcppZiggurat = [ pkgs.gsl_1 ];
|
||||
reprex = [ pkgs.which ];
|
||||
rgdal = [ pkgs.proj pkgs.gdal ];
|
||||
rgdal = [ pkgs.proj.dev pkgs.gdal ];
|
||||
rgeos = [ pkgs.geos ];
|
||||
rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ];
|
||||
rgl = [ pkgs.libGLU_combined pkgs.xlibsWrapper ];
|
||||
@ -420,7 +420,7 @@ let
|
||||
odbc = [ pkgs.pkgconfig ];
|
||||
openssl = [ pkgs.pkgconfig ];
|
||||
pdftools = [ pkgs.pkgconfig ];
|
||||
sf = [ pkgs.pkgconfig ];
|
||||
sf = [ pkgs.pkgconfig pkgs.sqlite.dev pkgs.proj.dev ];
|
||||
showtext = [ pkgs.pkgconfig ];
|
||||
spate = [ pkgs.pkgconfig ];
|
||||
stringi = [ pkgs.pkgconfig ];
|
||||
|
Loading…
Reference in New Issue
Block a user