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

Merge pull request #146050 from erictapen/mapnik-fix-build

Browse Source 
mapnik: fix build
This commit is contained in:
Christoph Hrdinka 2021-11-17 10:53:14 +01:00 committed by GitHub
commit 406ecf6074
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/mapnik/default.nix
View File

@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "An open source toolkit for developing mapping applications";
homepage = "https://mapnik.org";
maintainers = with maintainers; [ hrdinka ];
maintainers = with maintainers; [ hrdinka erictapen ];
license = licenses.lgpl21;
platforms = platforms.all;
# https://github.com/mapnik/mapnik/issues/4232

2
pkgs/development/python-modules/python-mapnik/default.nix
View File

@ -68,7 +68,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python bindings for Mapnik";
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ erictapen ];
homepage = "https://mapnik.org";
license = licenses.lgpl21;
};

10
pkgs/top-level/all-packages.nix
View File

@ -18510,7 +18510,15 @@ with pkgs;
opencl-clang = callPackage ../development/libraries/opencl-clang { };
mapnik = callPackage ../development/libraries/mapnik { };
mapnik = callPackage ../development/libraries/mapnik {
gdal = gdal.override {
libgeotiff = libgeotiff.override { proj = proj_7; };
libspatialite = libspatialite.override { proj = proj_7; };
proj = proj_7;
};
proj = proj_7;
};
marisa = callPackage ../development/libraries/marisa {};