ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-08 06:28:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47557 from knedlsepp/fix-mapnik

Browse Source 
python-mapnik: Fix build
This commit is contained in:
xeji 2018-09-30 21:12:09 +02:00 committed by GitHub
commit 339835b0f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/mapnik/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchzip, fetchpatch { stdenv, fetchzip, fetchpatch
, boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff , 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 # supply a postgresql package to enable the PostGIS input plugin
, postgresql ? null , postgresql ? null
@ -8,28 +8,22 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mapnik-${version}"; name = "mapnik-${version}";
version = "3.0.13"; version = "3.0.20";
src = fetchzip { src = fetchzip {
# this one contains all git submodules and is cheaper than fetchgit # 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"; 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 # a distinct dev output makes python-mapnik fail
outputs = [ "out" ]; outputs = [ "out" ];
nativeBuildInputs = [ python2 scons ]; nativeBuildInputs = [ python scons ];
buildInputs = buildInputs =
[ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
libwebp libxml2 proj python2 sqlite zlib libwebp libxml2 proj python sqlite zlib
# optional inputs # optional inputs
postgresql postgresql

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

@ -3351,19 +3351,43 @@ in {
python-mapnik = buildPythonPackage rec { python-mapnik = buildPythonPackage rec {
name = "python-mapnik-${version}"; name = "python-mapnik-${version}";
version = "3.0.13"; version = "3.0.16";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "mapnik"; owner = "mapnik";
repo = "python-mapnik"; repo = "python-mapnik";
rev = "v${version}"; rev = "v${version}";
sha256 = "0biw9bfkbsgfyjihyvkj4abx9s9r3h81rk6dc1y32022rypsqhkp"; sha256 = "1gqs4kvmjawdgl80j0ab5r8y0va9kw0rvwix3093xsv4hwd00lcc";
}; };
disabled = isPyPy; disabled = isPyPy;
doCheck = false; # doesn't find needed test data files doCheck = false; # doesn't find needed test data files
buildInputs = with pkgs; preBuild = let
[ boost cairo harfbuzz icu libjpeg libpng libtiff libwebp mapnik proj zlib ]; 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 ]; propagatedBuildInputs = with self; [ pillow pycairo ];
meta = with stdenv.lib; { meta = with stdenv.lib; {