alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs
History
Bruce Toll beed9092dd mapnik: fix missing proj and libxml2 support 
This commit provides three minor improvements:

1. Fix missing proj support. Fixes #91889.
2. Fix missing libxml2 support.
3. Improve build time with parallel build.

Fix missing proj support:
-------------------------
The 2019-07-09 update to proj version 6.1.1 in nixpkgs
commit d55cba68ff caused two problems for mapnik:

1. The separation of the dev output was not reflected in the mapnik
   expression. Since proj support is optional in the mapnik build,
   the build succeeded but no longer included proj support.

   See build log for: https://hydra.nixos.org/build/96274475.

2. Even if the mapnik expression was updated to use the separate
   dev output, it would still have dropped proj support because mapnik
   has not been updated for the proj 6 API.

This commit fixes the PROJ_INCLUDES to use the correct dev output and
also makes the PROJ_LIBS output explicit. In addition, it defines
ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 since mapnik still does not have
a tagged release that supports the proj 6 api.

Looking to the future, it appears that the mapnik master branch includes
proj 6 support, so some checks were included to help insure that this
workaround gets removed once it is no longer required.

Fix missing libxml2 support:
----------------------------
Configure with "XMLPARSER=libxml2" to get libxml2 support. This has been
needed since mapnik 3.0.2. Remove XML2_INCLUDES and XML2_LIBS which
trigger a bug in the supplied SConstruct script (when used with
"XMLPARSER=libxml2.

In addition, libxml2 needs to be a propagatedBuildInput to avoid
errors building apacheHttpdPackages.mod_tile, python-mapnik, and
possibly other packages.

Enable parallel build:
----------------------
Setting enableParallelBuild does not result in a parallel build
with mapnik. However, setting JOBS=$(NIX_BUILD_CORES) in buildFlags
works and significantly reduces the build time.
2021-05-11 13:10:37 -04:00
..
applications Merge pull request #122328 from Ma27/bump-gitea 2021-05-11 14:43:44 +02:00
build-support
common-updater
data Merge pull request #122346 from romildo/upd.marwaita 2021-05-10 19:39:57 +00:00
desktops Merge pull request #122269 from eduardosm/gnome-arcmenu 2021-05-10 19:06:18 +02:00
development mapnik: fix missing proj and libxml2 support 2021-05-11 13:10:37 -04:00
games gnuchess: 6.2.7 -> 6.2.8 2021-05-10 09:24:02 +01:00
misc vimPlugins.aurora: init at 2021-05-10 2021-05-10 19:54:21 -07:00
os-specific Merge pull request #122542 from Mic92/mbp2018-bridge-drv 2021-05-11 09:27:24 +01:00
pkgs-lib
servers home-assistant: 2021.5.1 -> 2021.5.2 2021-05-11 02:02:15 +02:00
shells Merge pull request #121964 from fortuneteller2k/add-hilbish 2021-05-10 19:19:38 +02:00
stdenv
test
tools hashcat: fixup opencl support (#121961) 2021-05-11 14:01:35 +02:00
top-level bottom-rs: init at unstable-2021-04-27 (#120937) 2021-05-11 11:46:24 +02:00