diff options
| author | Robert Schütz <nix@dotlambda.de> | 2022-10-30 11:55:14 -0700 |
|---|---|---|
| committer | Robert Schütz <nix@dotlambda.de> | 2022-10-30 11:55:24 -0700 |
| commit | 9a91d12bcd83e344fef21214c377fb4e63d0de27 (patch) | |
| tree | f5105155e5d4ed8cf712667d0b92e0f41b415ba9 /pkgs/development/libraries | |
| parent | 7bcfaeb21d57b8b926432bf017a94f030fbb2df8 (diff) | |
| download | nixpkgs-9a91d12bcd83e344fef21214c377fb4e63d0de27.tar nixpkgs-9a91d12bcd83e344fef21214c377fb4e63d0de27.tar.gz nixpkgs-9a91d12bcd83e344fef21214c377fb4e63d0de27.tar.bz2 nixpkgs-9a91d12bcd83e344fef21214c377fb4e63d0de27.tar.lz nixpkgs-9a91d12bcd83e344fef21214c377fb4e63d0de27.tar.xz nixpkgs-9a91d12bcd83e344fef21214c377fb4e63d0de27.tar.zst nixpkgs-9a91d12bcd83e344fef21214c377fb4e63d0de27.zip | |
mapnik: unstable-2022-04-14 -> unstable-2022-10-18
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/mapnik/cmake-harfbuzz.patch | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/mapnik/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/mapnik/cmake-harfbuzz.patch b/pkgs/development/libraries/mapnik/cmake-harfbuzz.patch index f44b879b592..1d5ca6903d0 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 d9ae74ed44a..f8da6e9ae03 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; }; |