From 8c90a4421a1636a4af95a3dfb73c2650bd181cc9 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 16:46:31 +0100
Subject: exiv2: update 0.24 -> 0.25

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

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

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 0702d24a80b..e1af46cc3ed 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -1,28 +1,20 @@
-{stdenv, fetchurl, fetchpatch, zlib, expat}:
+{ stdenv, fetchurl, fetchpatch, zlib, expat, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "exiv2-0.24";
+  name = "exiv2-0.25";
 
   src = fetchurl {
     url = "http://www.exiv2.org/${name}.tar.gz";
-    sha256 = "13pgvz14kyapxl89pxjaq3274k56d5lzfckpg1g9z7gvqzk4797l";
+    sha256 = "197g6vgcpyf9p2cwn5p5hb1r714xsk1v4p96f5pv1z8mi9vzq2y8";
   };
+  postPatch = "patchShebangs ./src/svn_version.sh";
 
-  patches = [(fetchpatch {
-    name = "CVE-2014-9449.diff";
-    url = "http://dev.exiv2.org/projects/exiv2/repository/revisions/3264/diff?format=diff&rev_to=3263";
-    sha256 = "02w0fksl966d4v6bkg6rq3wmvv8xjpvfp47qr0nv1xq0bphxqzag";
-  })];
-
-  propagatedBuildInputs = [zlib expat];
-
-# configure script finds zlib&expat but it thinks that they're in /usr
-  configureFlags = "--with-zlib=${zlib} --with-expat=${expat}";
+  nativeBuildInputs = [ gettext ];
+  propagatedBuildInputs = [ zlib expat ];
 
   meta = {
     homepage = http://www.exiv2.org/;
     description = "A library and command-line utility to manage image metadata";
-    maintainers = [stdenv.lib.maintainers.urkud];
     platforms = stdenv.lib.platforms.all;
   };
 }
-- 
cgit 1.4.1