python39Packages.python-mapnik: cleanup, remove pkgs from input, remove alias
This commit is contained in:
parent
4600fb8466
commit
96f904b076
|
@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ python ];
|
nativeBuildInputs = [ python ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs = [
|
||||||
[ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
|
boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
|
||||||
libwebp proj python sqlite zlib
|
libwebp proj python sqlite zlib
|
||||||
|
|
||||||
# optional inputs
|
# optional inputs
|
||||||
postgresql
|
postgresql
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ libxml2 ];
|
propagatedBuildInputs = [ libxml2 ];
|
||||||
|
|
||||||
|
|
|
@ -1,26 +1,29 @@
|
||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
, isPyPy
|
, isPyPy
|
||||||
, python
|
, python
|
||||||
, pkgs
|
|
||||||
, pillow
|
, pillow
|
||||||
, pycairo
|
, pycairo
|
||||||
|
, pkg-config
|
||||||
|
, boost
|
||||||
|
, cairo
|
||||||
|
, harfbuzz
|
||||||
|
, icu
|
||||||
|
, libjpeg
|
||||||
|
, libpng
|
||||||
|
, libtiff
|
||||||
|
, libwebp
|
||||||
|
, mapnik
|
||||||
|
, proj
|
||||||
|
, zlib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
buildPythonPackage rec {
|
||||||
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 = "unstable-2020-02-24";
|
version = "unstable-2020-02-24";
|
||||||
|
|
||||||
src = pkgs.fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mapnik";
|
owner = "mapnik";
|
||||||
repo = "python-mapnik";
|
repo = "python-mapnik";
|
||||||
rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b";
|
rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b";
|
||||||
|
@ -29,10 +32,8 @@ in buildPythonPackage rec {
|
||||||
|
|
||||||
disabled = isPyPy;
|
disabled = isPyPy;
|
||||||
doCheck = false; # doesn't find needed test data files
|
doCheck = false; # doesn't find needed test data files
|
||||||
preBuild = let
|
preBuild = ''
|
||||||
pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
|
export BOOST_PYTHON_LIB="boost_python${"${lib.versions.major python.version}${lib.versions.minor python.version}"}"
|
||||||
in ''
|
|
||||||
export BOOST_PYTHON_LIB="boost_python${pythonVersion}"
|
|
||||||
export BOOST_THREAD_LIB="boost_thread"
|
export BOOST_THREAD_LIB="boost_thread"
|
||||||
export BOOST_SYSTEM_LIB="boost_system"
|
export BOOST_SYSTEM_LIB="boost_system"
|
||||||
export PYCAIRO=true
|
export PYCAIRO=true
|
||||||
|
@ -40,7 +41,7 @@ in buildPythonPackage rec {
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
mapnik # for mapnik_config
|
mapnik # for mapnik_config
|
||||||
pkgs.pkgconfig
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -50,7 +51,6 @@ in buildPythonPackage rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
mapnik
|
mapnik
|
||||||
boost
|
boost
|
||||||
] ++ (with pkgs; [
|
|
||||||
cairo
|
cairo
|
||||||
harfbuzz
|
harfbuzz
|
||||||
icu
|
icu
|
||||||
|
@ -60,15 +60,16 @@ in buildPythonPackage rec {
|
||||||
libwebp
|
libwebp
|
||||||
proj
|
proj
|
||||||
zlib
|
zlib
|
||||||
]);
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ pillow pycairo ];
|
propagatedBuildInputs = [ pillow pycairo ];
|
||||||
|
|
||||||
pythonImportsCheck = [ "mapnik" ] ;
|
pythonImportsCheck = [ "mapnik" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Python bindings for Mapnik";
|
description = "Python bindings for Mapnik";
|
||||||
|
maintainers = with maintainers; [ ];
|
||||||
homepage = "https://mapnik.org";
|
homepage = "https://mapnik.org";
|
||||||
license = licenses.lgpl21;
|
license = licenses.lgpl21;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7079,7 +7079,18 @@ in {
|
||||||
|
|
||||||
python_magic = callPackage ../development/python-modules/python-magic { };
|
python_magic = callPackage ../development/python-modules/python-magic { };
|
||||||
|
|
||||||
python-mapnik = callPackage ../development/python-modules/python-mapnik { };
|
python-mapnik = let
|
||||||
|
boost = pkgs.boost.override {
|
||||||
|
enablePython = true;
|
||||||
|
inherit python;
|
||||||
|
};
|
||||||
|
in callPackage ../development/python-modules/python-mapnik {
|
||||||
|
inherit (pkgs) pkg-config cairo harfbuzz icu libjpeg libpng libtiff libwebp proj zlib;
|
||||||
|
inherit boost;
|
||||||
|
mapnik = pkgs.mapnik.override {
|
||||||
|
inherit python boost;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
python-markdown-math = callPackage ../development/python-modules/python-markdown-math { };
|
python-markdown-math = callPackage ../development/python-modules/python-markdown-math { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue