From 24d2ddfb1dd3419448909f89a9e011b7837b0542 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 27 Sep 2016 15:17:28 +0200
Subject: mapnik: 3.0.10 -> 3.0.12

---
 pkgs/development/libraries/mapnik/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'pkgs/development/libraries/mapnik/default.nix')

diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index de8cc1e49cc28..1df9cf0492dca 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl
+{ stdenv, fetchzip
 , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
 , libwebp, libxml2, proj, python, scons, sqlite, zlib
 }:
 
 stdenv.mkDerivation rec {
   name = "mapnik-${version}";
-  version = "3.0.10";
+  version = "3.0.12";
 
-  src = fetchurl {
-    url = "https://mapnik.s3.amazonaws.com/dist/v${version}/mapnik-v${version}.tar.bz2";
-    sha256 = "0fda6syrfb81930sf7rgw1qmpnik8k1ngrjkh43ywd3s37nbqh1n";
+  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 = "02w360fxk0pfkk0zbwc134jq7rkkib58scs5k67j8np6fx6gag6i";
   };
 
-  outputs = [ "out" "dev" ];
+  # a distinct dev output makes python-mapnik fail
+  outputs = [ "out" ];
 
   nativeBuildInputs = [ python scons ];
 
-- 
cgit 1.4.1