pyrox.dev
lol
perlPackages.Tirex: fix build with recent mapnik (#366883)
authored by
Marcus Ramberg
and committed by
GitHub
48352194
a0ff946d
+20
-6
+7
-6
pkgs/development/perl-modules/Tirex/default.nix
+7
-6
pkgs/development/perl-modules/Tirex/default.nix
···
10
10
mapnik,
11
11
boost,
12
12
nix-update-script,
13
+
pkg-config,
13
14
}:
14
15
15
16
buildPerlPackage rec {
···
30
31
url = "https://github.com/openstreetmap/tirex/commit/5f131231c9c12e88793afba471b150ca8af8d587.patch";
31
32
hash = "sha256-bnL1ZGy8ZNSZuCRbZn59qRVLg3TL0GjFYnhRKroeVO0=";
32
33
})
33
-
# Support Mapnik >= v4.0.0 (boost:filesystem no longer indirectly linked)
34
-
# https://github.com/openstreetmap/tirex/pull/59
35
-
(fetchpatch {
36
-
url = "https://github.com/openstreetmap/tirex/commit/137903be9b7b35dde4c7010e65faa16bcf6ad476.patch";
37
-
hash = "sha256-JDqwWVnzExPwLpzv4LbSmGYah956uko+Zdicahua9oQ=";
38
-
})
34
+
# Support Mapnik >= v4.0.0 (no more mapnik-config)
35
+
./use-pkg-config.patch
36
+
];
37
+
38
+
nativeBuildInputs = [
39
+
pkg-config
39
40
];
40
41
41
42
buildInputs = [
+13
pkgs/development/perl-modules/Tirex/use-pkg-config.patch
+13
pkgs/development/perl-modules/Tirex/use-pkg-config.patch
···
1
+
--- a/backend-mapnik/Makefile
2
+
+++ b/backend-mapnik/Makefile
3
+
@@ -1,8 +1,7 @@
4
+
INSTALLOPTS=-g root -o root
5
+
-CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
6
+
-CXXFLAGS = `mapnik-config --cflags` $(CFLAGS)
7
+
+CXXFLAGS += `pkg-config --cflags libmapnik` -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
8
+
CXXFLAGS += -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wold-style-cast
9
+
-LDFLAGS= `mapnik-config --libs --ldflags --dep-libs`
10
+
+LDFLAGS += `pkg-config --libs libmapnik` -lboost_filesystem
11
+
12
+
backend-mapnik: renderd.o metatilehandler.o networklistener.o networkmessage.o networkrequest.o networkresponse.o debuggable.o requesthandler.o
13
+
$(CXX) -o $@ $^ $(LDFLAGS)