JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #231735 from Dettorer/fix-mapnik

Browse Source 
python3Packages.python-mapnik: fix build on x86_64
This commit is contained in:
Martin Weinelt 2023-05-14 19:16:03 +02:00 committed by GitHub
commit 9ab371d5d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/python-modules/python-mapnik/default.nix
View File

@ -8,7 +8,7 @@
, pillow , pillow
, pycairo , pycairo
, pkg-config , pkg-config
, boost , boost182
, cairo , cairo
, harfbuzz , harfbuzz
, icu , icu
@ -23,6 +23,7 @@
, sqlite , sqlite
, nose , nose
, pytestCheckHook , pytestCheckHook
, stdenv
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -60,7 +61,7 @@ buildPythonPackage rec {
buildInputs = [ buildInputs = [
mapnik mapnik
boost boost182
cairo cairo
harfbuzz harfbuzz
icu icu
@ -98,6 +99,9 @@ buildPythonPackage rec {
preCheck = '' preCheck = ''
# import from $out # import from $out
rm -r mapnik rm -r mapnik
'' + lib.optionalString stdenv.isDarwin ''
# Replace the hardcoded /tmp references with $TMPDIR
sed -i "s,/tmp,$TMPDIR,g" test/python_tests/*.py
''; '';
# https://github.com/mapnik/python-mapnik/issues/255 # https://github.com/mapnik/python-mapnik/issues/255
@ -106,6 +110,7 @@ buildPythonPackage rec {
"test_compare_map" "test_compare_map"
"test_dataraster_coloring" "test_dataraster_coloring"
"test_dataraster_query_point" "test_dataraster_query_point"
"test_geometry_type"
"test_good_files" "test_good_files"
"test_layer_init" "test_layer_init"
"test_load_save_map" "test_load_save_map"
@ -128,6 +133,8 @@ buildPythonPackage rec {
"test_visual_zoom_all_rendering1" "test_visual_zoom_all_rendering1"
"test_visual_zoom_all_rendering2" "test_visual_zoom_all_rendering2"
"test_wgs84_inverse_forward" "test_wgs84_inverse_forward"
] ++ lib.optional stdenv.isDarwin [
"test_passing_pycairo_context_pdf"
]; ];
pythonImportsCheck = [ "mapnik" ]; pythonImportsCheck = [ "mapnik" ];

2
pkgs/top-level/python-packages.nix
View File

@ -9757,7 +9757,7 @@ self: super: with self; {
python-mapnik = callPackage ../development/python-modules/python-mapnik rec { python-mapnik = callPackage ../development/python-modules/python-mapnik rec {
inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib; inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib;
boost = pkgs.boost.override { boost182 = pkgs.boost182.override {
enablePython = true; enablePython = true;
inherit python; inherit python;
}; };