From a45f138a414e63445747870f54a3be77e9b25c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 21:58:36 +0000 Subject: [PATCH] mapnik: unvendor scons --- pkgs/development/libraries/mapnik/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 14eb3c047e2..13e34bebee6 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,12 +1,15 @@ { lib, stdenv, fetchzip , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff , libwebp, libxml2, proj, python3, python ? python3, sqlite, zlib +, sconsPackages # supply a postgresql package to enable the PostGIS input plugin , postgresql ? null }: -stdenv.mkDerivation rec { +let + scons = sconsPackages.scons_3_0_1; +in stdenv.mkDerivation rec { pname = "mapnik"; version = "3.1.0"; @@ -16,10 +19,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-qqPqN4vs3ZsqKgnx21yQhX8OzHca/0O+3mvQ/vnC5EY="; }; + postPatch = '' + substituteInPlace configure \ + --replace '$PYTHON scons/scons.py' ${scons}/bin/scons + rm -r scons + ''; + # a distinct dev output makes python-mapnik fail outputs = [ "out" ]; - nativeBuildInputs = [ python3 ]; + nativeBuildInputs = [ scons ]; buildInputs = [ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff