Unverified Commit 9ab371d5 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #231735 from Dettorer/fix-mapnik 

python3Packages.python-mapnik: fix build on x86_64
parents 285330f0 cfe4464d

pkgs/development/python-modules/python-mapnik/default.nix

+9 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
, pillow

, pycairo

, pkg-config

, boost

, boost182

, cairo

, harfbuzz

, icu
@@ -23,6 +23,7 @@ 
, sqlite

, nose

, pytestCheckHook

, stdenv

}:



buildPythonPackage rec {
@@ -60,7 +61,7 @@ buildPythonPackage rec { 


  buildInputs = [

    mapnik

    boost

    boost182

    cairo

    harfbuzz

    icu
@@ -98,6 +99,9 @@ buildPythonPackage rec { 
  preCheck = ''

    # import from $out

    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
@@ -106,6 +110,7 @@ buildPythonPackage rec { 
    "test_compare_map"

    "test_dataraster_coloring"

    "test_dataraster_query_point"

    "test_geometry_type"

    "test_good_files"

    "test_layer_init"

    "test_load_save_map"
@@ -128,6 +133,8 @@ buildPythonPackage rec { 
    "test_visual_zoom_all_rendering1"

    "test_visual_zoom_all_rendering2"

    "test_wgs84_inverse_forward"

  ] ++ lib.optional stdenv.isDarwin [

    "test_passing_pycairo_context_pdf"

  ];



  pythonImportsCheck = [ "mapnik" ];

pkgs/top-level/python-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -9757,7 +9757,7 @@ self: super: with self; { 


  python-mapnik = callPackage ../development/python-modules/python-mapnik rec {

    inherit (pkgs) pkg-config cairo icu libjpeg libpng libtiff libwebp proj zlib;

    boost = pkgs.boost.override {

    boost182 = pkgs.boost182.override {

      enablePython = true;

      inherit python;

    };