tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git i/build.py w/build.py
2index 0f94826b6..5e91793f2 100644
3--- i/build.py
4+++ w/build.py
5@@ -109,9 +109,8 @@ py_env.AppendUnique(LIBS='mapnik-wkt')
6
7 _mapnik = py_env.LoadableModule('mapnik/_mapnik', sources, LDMODULEPREFIX='', LDMODULESUFFIX='.so')
8
9-Depends(_mapnik, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
10-Depends(_mapnik, env.subst('../../src/json/libmapnik-json${LIBSUFFIX}'))
11-Depends(_mapnik, env.subst('../../src/wkt/libmapnik-wkt${LIBSUFFIX}'))
12+Depends(_mapnik, env.subst('@libmapnik@/libmapnikjson${LIBSUFFIX}'))
13+Depends(_mapnik, env.subst('@libmapnik@/libmapnikwkt${LIBSUFFIX}'))
14
15 if 'uninstall' not in COMMAND_LINE_TARGETS:
16 pymapniklib = env.Install(target_path,_mapnik)
17diff --git i/setup.py w/setup.py
18index 24ca0ec5e..bc2b1e0e0 100755
19--- i/setup.py
20+++ w/setup.py
21@@ -19,8 +19,8 @@ linkflags.extend(check_output([mapnik_config, '--libs']).split(' '))
22 linkflags.extend(check_output([mapnik_config, '--ldflags']).split(' '))
23 linkflags.extend(check_output([mapnik_config, '--dep-libs']).split(' '))
24 linkflags.extend([
25- '-lmapnik-wkt',
26- '-lmapnik-json',
27+ '-lmapnikwkt',
28+ '-lmapnikjson',
29 ])
30
31 # Remove symlinks