mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-22 00:20:58 +00:00
rPackages.sf: fix dependencies
This commit is contained in:
committed by
Michael Daniels
parent
55193a46ce
commit
58df3d27bd
@@ -872,11 +872,9 @@ let
|
||||
bzip2
|
||||
];
|
||||
sf = with pkgs; [
|
||||
gdal
|
||||
proj
|
||||
geos
|
||||
libtiff
|
||||
curl
|
||||
pkg-config
|
||||
gdal # for gdal-config
|
||||
geos # for geos-config
|
||||
];
|
||||
fio = with pkgs; [
|
||||
cargo
|
||||
@@ -1283,9 +1281,8 @@ let
|
||||
];
|
||||
saeMSPE = [ pkgs.gsl.dev ];
|
||||
sf = with pkgs; [
|
||||
pkg-config
|
||||
sqlite.dev
|
||||
proj.dev
|
||||
proj
|
||||
sqlite
|
||||
];
|
||||
terra = with pkgs; [
|
||||
pkg-config
|
||||
@@ -2172,12 +2169,6 @@ let
|
||||
'';
|
||||
});
|
||||
|
||||
sf = old.sf.overrideAttrs (attrs: {
|
||||
configureFlags = [
|
||||
"--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib"
|
||||
];
|
||||
});
|
||||
|
||||
terra = old.terra.overrideAttrs (attrs: {
|
||||
configureFlags = [
|
||||
"--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib"
|
||||
|
||||
Reference in New Issue
Block a user