diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index cd13cc850a15..c41ebde0241e 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "mapnik"; - version = "4.0.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; rev = "v${version}"; - hash = "sha256-CNFNGMJU3kzkRrOGsf8/uv5ebHPEQ0tkA+5OubRVEjs="; + hash = "sha256-U5QQ7I7ZBNlMm74Vpvv8lvJ4EefM3+jHURFAP03Lmvw="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch b/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch index ec80423689d3..8da5dcd5b474 100644 --- a/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch +++ b/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch @@ -1,13 +1,24 @@ diff --git a/cmake/MapnikExportPkgConfig.cmake b/cmake/MapnikExportPkgConfig.cmake -index e459f80ef..ec18a71a2 100644 +index f12ed57f1..548e1e6e9 100644 --- a/cmake/MapnikExportPkgConfig.cmake +++ b/cmake/MapnikExportPkgConfig.cmake -@@ -65,8 +65,8 @@ prefix=@CMAKE_INSTALL_PREFIX@ +@@ -3,7 +3,7 @@ function(create_pkg_config_file _target _lib_name _description) + prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} includedir=${prefix}/include - libdir=${exec_prefix}/lib +-libdir=${exec_prefix}/@MAPNIK_LIB_DIR@ ++libdir=${exec_prefix}@MAPNIK_LIB_DIR@ + + Name: @_lib_name@ + Description: @_description@ +@@ -64,9 +64,9 @@ function(create_pkg_config_file_mapnik _lib_name _description) + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} + includedir=${prefix}/include +-libdir=${exec_prefix}/@MAPNIK_LIB_DIR@ -fonts_dir=${prefix}/@FONTS_INSTALL_DIR@ -plugins_dir=${prefix}/@PLUGINS_INSTALL_DIR@ ++libdir=${exec_prefix}@MAPNIK_LIB_DIR@ +fonts_dir=@FONTS_INSTALL_DIR@ +plugins_dir=@PLUGINS_INSTALL_DIR@