From 2b84e72fc646ac6d715024bc64e221d7021d5e35 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 15 Nov 2021 00:55:03 +0100 Subject: [PATCH 1/3] mapnik: fix build by using proj 7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Robert Schütz --- pkgs/top-level/all-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee2d656c8bcf..f86e0876e9f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18490,7 +18490,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 {}; From c98ae967d35f23d3598d0ff1399eb7d9b07545ad Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 15 Nov 2021 00:59:16 +0100 Subject: [PATCH 2/3] mapnik: add erictapen as maintainer --- pkgs/development/libraries/mapnik/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 6fff0c1e1bbc..14eb3c047e2a 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -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 From ebee81f3c7ed694a59b49cc14330a293458af9f9 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 15 Nov 2021 00:59:52 +0100 Subject: [PATCH 3/3] python3Packages.python-mapnik: add erictapen as maintainer --- pkgs/development/python-modules/python-mapnik/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 3a4e4af54def..2d888518ff45 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -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; };