python.pkgs.python-mapnik: fix build

fallout of https://github.com/NixOS/nixpkgs/pull/54182
This commit is contained in:
Robert Schütz 2019-03-21 12:35:29 +01:00
parent 76bfc09ff3
commit 8519983a31

View File

@ -8,7 +8,16 @@
, pycairo , pycairo
}: }:
buildPythonPackage rec { let
boost = pkgs.boost.override {
enablePython = true;
inherit python;
};
mapnik = pkgs.mapnik.override {
inherit python boost;
};
in buildPythonPackage rec {
pname = "python-mapnik"; pname = "python-mapnik";
version = "3.0.16"; version = "3.0.16";
@ -28,15 +37,15 @@ buildPythonPackage rec {
export BOOST_THREAD_LIB="boost_thread" export BOOST_THREAD_LIB="boost_thread"
export BOOST_SYSTEM_LIB="boost_system" export BOOST_SYSTEM_LIB="boost_system"
''; '';
buildInputs = with pkgs; [
(boost.override { nativeBuildInputs = [
enablePython = true; mapnik # for mapnik_config
inherit python; ];
})
(mapnik.override { buildInputs = [
inherit python; mapnik
boost = (boost.override { enablePython = true; inherit python; }); boost
}) ] ++ (with pkgs; [
cairo cairo
harfbuzz harfbuzz
icu icu
@ -46,7 +55,7 @@ buildPythonPackage rec {
libwebp libwebp
proj proj
zlib zlib
]; ]);
propagatedBuildInputs = [ pillow pycairo ]; propagatedBuildInputs = [ pillow pycairo ];
meta = with stdenv.lib; { meta = with stdenv.lib; {