Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

1 files changed, 33 insertions, 9 deletions

diff --git a/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix b/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix
index 540d6d01a411..6bf670a40382 100644
--- a/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix
@@ -1,18 +1,42 @@
-{lib, stdenv, fetchurl}:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, libiconv
+, libintl
+}:
 
 stdenv.mkDerivation rec {
   pname = "libiptcdata";
-  version = "1.0.4";
+  version = "1.0.5";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/libiptcdata/${pname}-${version}.tar.gz";
-    sha256 = "03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr";
+  src = fetchFromGitHub {
+    owner = "ianw";
+    repo = pname;
+    rev = "release_${builtins.replaceStrings ["."] ["_"] version}";
+    sha256 = "sha256-ZjokepDAHiSEwXrkvM9qUAPcpIiRQoOsv7REle7roPU=";
   };
 
-  meta = {
+  postPatch = ''
+    # gtk-doc doesn't build without network access
+    sed -i '/GTK_DOC_CHECK/d;/docs/d' configure.ac
+    sed -i 's/docs//' Makefile.am
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    libiconv
+    libintl
+  ];
+
+  meta = with lib; {
     description = "Library for reading and writing the IPTC metadata in images and other files";
-    homepage = "http://libiptcdata.sourceforge.net/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.unix;
+    homepage = "https://github.com/ianw/libiptcdata";
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wegank ];
   };
 }