mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-28 00:24:18 +00:00
dfa2fbc087
Removed no-longer-needed patch:
* `include.patch`: Fixed [here](64a031a19b)
Added patch to account for `FONTS_INSTALL_DIR`/`PLUGINS_INSTALL_DIR`
containing full paths, causing this issue:
```
Broken paths found in a .pc file! /nix/store/lriysmfydb9p6g6s02q6ri24nzwmi494-mapnik-unstable-2023-11-28/lib/pkgconfig/libmapnik.pc
The following lines have issues (specifically '//' in paths).
5:fonts_dir=${prefix}//nix/store/lriysmfydb9p6g6s02q6ri24nzwmi494-mapnik-unstable-2023-11-28/lib/mapnik/fonts
6:plugins_dir=${prefix}//nix/store/lriysmfydb9p6g6s02q6ri24nzwmi494-mapnik-unstable-2023-11-28/lib/mapnik/input
```
Enabled `Checks`, which requires a patch to allow one test to fail:
* `datasource-ogr-test-should-fail.patch`
16 lines
527 B
Diff
16 lines
527 B
Diff
diff --git a/cmake/MapnikExportPkgConfig.cmake b/cmake/MapnikExportPkgConfig.cmake
|
|
index e459f80ef..ec18a71a2 100644
|
|
--- a/cmake/MapnikExportPkgConfig.cmake
|
|
+++ b/cmake/MapnikExportPkgConfig.cmake
|
|
@@ -65,8 +65,8 @@ prefix=@CMAKE_INSTALL_PREFIX@
|
|
exec_prefix=${prefix}
|
|
includedir=${prefix}/include
|
|
libdir=${exec_prefix}/lib
|
|
-fonts_dir=${prefix}/@FONTS_INSTALL_DIR@
|
|
-plugins_dir=${prefix}/@PLUGINS_INSTALL_DIR@
|
|
+fonts_dir=@FONTS_INSTALL_DIR@
|
|
+plugins_dir=@PLUGINS_INSTALL_DIR@
|
|
|
|
Name: @_lib_name@
|
|
Description: @_description@
|