dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions2 Packages Projects Releases Wiki Activity

mapnik: 4.0.0 -> 4.0.2 ()

Browse Source
This commit is contained in:
Aleksana 2024-09-08 13:55:41 +08:00 committed by GitHub
commit fae6fb8e6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 5 deletions
pkgs/development/libraries/mapnik
default.nixexport-pkg-config-full-paths.patch

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

@ -28,13 +28,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mapnik"; pname = "mapnik";
version = "4.0.0"; version = "4.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mapnik"; owner = "mapnik";
repo = "mapnik"; repo = "mapnik";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-CNFNGMJU3kzkRrOGsf8/uv5ebHPEQ0tkA+5OubRVEjs="; hash = "sha256-U5QQ7I7ZBNlMm74Vpvv8lvJ4EefM3+jHURFAP03Lmvw=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

17
pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch
View File

@ -1,13 +1,24 @@
diff --git a/cmake/MapnikExportPkgConfig.cmake b/cmake/MapnikExportPkgConfig.cmake diff --git a/cmake/MapnikExportPkgConfig.cmake b/cmake/MapnikExportPkgConfig.cmake
index e459f80ef..ec18a71a2 100644 index f12ed57f1..548e1e6e9 100644
--- a/cmake/MapnikExportPkgConfig.cmake --- a/cmake/MapnikExportPkgConfig.cmake
+++ b/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} exec_prefix=${prefix}
includedir=${prefix}/include 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@ -fonts_dir=${prefix}/@FONTS_INSTALL_DIR@
-plugins_dir=${prefix}/@PLUGINS_INSTALL_DIR@ -plugins_dir=${prefix}/@PLUGINS_INSTALL_DIR@
+libdir=${exec_prefix}@MAPNIK_LIB_DIR@
+fonts_dir=@FONTS_INSTALL_DIR@ +fonts_dir=@FONTS_INSTALL_DIR@
+plugins_dir=@PLUGINS_INSTALL_DIR@ +plugins_dir=@PLUGINS_INSTALL_DIR@