diff options
| -rw-r--r-- | pkgs/development/libraries/mapnik/cmake-harfbuzz.patch | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/mapnik/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/libraries/mapnik/cmake-harfbuzz.patch b/pkgs/development/libraries/mapnik/cmake-harfbuzz.patch index f44b879b592f7..1d5ca6903d0b1 100644 --- a/pkgs/development/libraries/mapnik/cmake-harfbuzz.patch +++ b/pkgs/development/libraries/mapnik/cmake-harfbuzz.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2dc1f02d..739b8ae99 100644 +index d87a7052d..837867551 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,19 +153,8 @@ endif() @@ -12,7 +12,7 @@ index f2dc1f02d..739b8ae99 100644 - message(STATUS "Found harfbuzz native cmake") - list(APPEND MAPNIK_OPTIONAL_LIBS harfbuzz::harfbuzz) -else() -- # Use pkg-config when harfbuzz is not found. +- # Use pkg-config when harfbuzz is not found. - # It might be possible that in future version harfbuzz could only be found via pkg-config. - # harfbuzz related discussion: https://github.com/harfbuzz/harfbuzz/issues/2653 - message(STATUS "harfbuzz not found via cmake. Searching via pkg-config...") diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index d9ae74ed44a0a..f8da6e9ae03eb 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "mapnik"; - version = "unstable-2022-04-14"; + version = "unstable-2022-10-18"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; - rev = "1ba1278b4227ccd887a95880d1c75aa6446132fc"; - sha256 = "sha256-dtu+PKpK/crO5cZje0aj+vB9beG0eU6fyT9GNtvvtbM="; + rev = "05661e54392bcbb3367747f97a3ef6e468c105ba"; + hash = "sha256-96AneLPH1gbh/u880Pdc9OdFq2MniSdaTJoKYqId7sw="; fetchSubmodules = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b924c73b72131..e27c00ea6feb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21066,7 +21066,6 @@ with pkgs; harfbuzz = harfbuzz.override { withIcu = true; }; - boost = boost175; }; manticoresearch = callPackage ../servers/search/manticoresearch { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6beb5e1c84f49..fd7031c91d54a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9000,7 +9000,7 @@ self: super: with self; { python-mapnik = callPackage ../development/python-modules/python-mapnik rec { inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib; - boost = pkgs.boost175.override { + boost = pkgs.boost.override { enablePython = true; inherit python; }; |