Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

python-mapnik: Fix build #47557

Merged
merged 2 commits into from
Sep 30, 2018
Merged

python-mapnik: Fix build #47557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1857da
mapnik: 3.0.13 -> 3.0.20
knedlsepp Sep 30, 2018
be6451e
pythonPackages.python-mapnik: Fix build
knedlsepp Sep 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions pkgs/development/libraries/mapnik/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
{ stdenv, fetchzip, fetchpatch
, boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
, libwebp, libxml2, proj, python2, scons, sqlite, zlib
, libwebp, libxml2, proj, python, scons, sqlite, zlib

# supply a postgresql package to enable the PostGIS input plugin
, postgresql ? null
}:

stdenv.mkDerivation rec {
name = "mapnik-${version}";
version = "3.0.13";
version = "3.0.20";

src = fetchzip {
# this one contains all git submodules and is cheaper than fetchgit
url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2";
sha256 = "189wsd6l6awblkiha666l1sdyp7ifmnfsa87y0j37rvym6w4r065";
sha256 = "05a2hvvk5s4x3wjvh4spd717vd5ri7h0sql7aarpi9jpc5h6xicc";
};

patches = [(fetchpatch {
name = "icu-59.diff";
url = https://github.com/mapnik/mapnik/commit/9e58c890430d.diff;
sha256 = "0h546qq8g19gw9s4979hla9vkq5kcwh3q45ryajyjhmlr2z9fi6p";
})];

# a distinct dev output makes python-mapnik fail
outputs = [ "out" ];

nativeBuildInputs = [ python2 scons ];
nativeBuildInputs = [ python scons ];

buildInputs =
[ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
libwebp libxml2 proj python2 sqlite zlib
libwebp libxml2 proj python sqlite zlib

# optional inputs
postgresql
Expand Down
32 changes: 28 additions & 4 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3345,19 +3345,43 @@ in {

python-mapnik = buildPythonPackage rec {
name = "python-mapnik-${version}";
version = "3.0.13";
version = "3.0.16";

src = pkgs.fetchFromGitHub {
owner = "mapnik";
repo = "python-mapnik";
rev = "v${version}";
sha256 = "0biw9bfkbsgfyjihyvkj4abx9s9r3h81rk6dc1y32022rypsqhkp";
sha256 = "1gqs4kvmjawdgl80j0ab5r8y0va9kw0rvwix3093xsv4hwd00lcc";
};

disabled = isPyPy;
doCheck = false; # doesn't find needed test data files
buildInputs = with pkgs;
[ boost cairo harfbuzz icu libjpeg libpng libtiff libwebp mapnik proj zlib ];
preBuild = let
pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}";
in ''
export BOOST_PYTHON_LIB="boost_python${pythonVersion}"
export BOOST_THREAD_LIB="boost_thread"
export BOOST_SYSTEM_LIB="boost_system"
'';
buildInputs = with pkgs; [
(boost.override {
enablePython = true;
inherit python;
})
(mapnik.override {
inherit python;
boost = (boost.override { enablePython = true; inherit python; });
})
cairo
harfbuzz
icu
libjpeg
libpng
libtiff
libwebp
proj
zlib
];
propagatedBuildInputs = with self; [ pillow pycairo ];

meta = with stdenv.lib; {
Expand Down