From 3932a91776a067c7a8b3f8186d14d38c1bab78e2 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 15 Oct 2017 11:57:52 +0200 Subject: mapnik: fix build with new icu via upstream patch --- pkgs/development/libraries/mapnik/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 96dbc094b55c..0546bdc6359b 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip +{ stdenv, fetchzip, fetchpatch , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff , libwebp, libxml2, proj, python2, scons, sqlite, zlib @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { sha256 = "189wsd6l6awblkiha666l1sdyp7ifmnfsa87y0j37rvym6w4r065"; }; + 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" ]; -- cgit 1.4.1