Commit Graph

24 Commits

Author SHA1 Message Date
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
Christoph Hrdinka
4417228708
Merge pull request #110100 from r-ryantm/auto-update/mapnik
mapnik: 3.0.23 -> 3.1.0
2021-01-27 16:13:57 +01:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
R. RyanTM
b14d9d7dc4 mapnik: 3.0.23 -> 3.1.0 2021-01-20 07:19:03 +00:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
R. RyanTM
e4442fbf23 mapnik: 3.0.22 -> 3.0.23 2020-02-19 08:19:39 +00:00
c0bw3b
9367367dfd Treewide: fix URL permanent redirects
Permanent redirects on homepages and/or source URLs
as reported by Repology
2019-11-16 01:41:23 +01:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
R. RyanTM
abb8c3f55b mapnik: 3.0.21 -> 3.0.22
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mapnik/versions
2019-03-10 16:24:23 -07:00
Josef Kemetmüller
e844f08125 mapnik: Fix build 2019-03-04 21:41:53 +01:00
Matthew Bauer
9cac8feafb mapnik: use provided configure script
This gives us support for the class autoconf “./configure && make &&
make install” build-style.
2018-11-14 14:00:19 -06:00
Matthew Bauer
bfbfe941ab treewide: use scons setup hook
Lots of packages can use it. Here is the list:

- jackmix
- klick
- mixx
- nova-filters
- rhvoice
- giv
- mypaint
- swift-im
- bombono
- mapnik
- serf
- nuitka
- pyexiv2
- godot
- hammer
- toluapp
- btanks
- dxx-rebirth
- endless-sky
- globulation
- the-powder-toy
- fceux
- gpsd
- mongodb
- rippled
- mariadb
- lprof
2018-11-13 19:14:10 -06:00
R. RyanTM
8cdf5ae36c mapnik: 3.0.20 -> 3.0.21
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mapnik/versions
2018-10-14 05:39:30 -07:00
Josef Kemetmüller
b1857daa25 mapnik: 3.0.13 -> 3.0.20 2018-09-30 13:44:41 +02:00
Vladimír Čunát
3932a91776
mapnik: fix build with new icu via upstream patch 2017-10-15 11:57:52 +02:00
Lorenzo Manacorda
0f918b9846 mapnik: 3.0.12 -> 3.0.13 2017-05-07 20:28:56 +02:00
Chris Hodapp
5864baa4c6
mapnik: add optional PostgreSQL dependency
Closes #25063.
2017-04-21 16:50:43 +02:00
Frederik Rietdijk
a805b1206d mapnik: use python2
because python3 is not yet supported.
2017-02-08 19:51:11 +01:00
Josef Kemetmueller
80eafb39e1
mapnik: Make dependencies explicit for SCons
This is necessary to fix the build for (at least) darwin. If the
arguments are not specified explicitly then homebrew-install locations
are assumed for at least "icu".

Closes #20395.
2016-11-15 17:33:59 +01:00
Christoph Hrdinka
24d2ddfb1d
mapnik: 3.0.10 -> 3.0.12 2016-09-27 15:17:28 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Christoph Hrdinka
17dc0a544c mapnik: 3.0.9 -> 3.0.10 2016-06-13 11:59:04 +02:00
Christoph Hrdinka
2c54da93ef mapnik: init at 3.0.9 2015-12-04 18:03:16 +01:00