From aa652e09d2de775036041d485212ed6a47b52b89 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 29 Mar 2015 05:02:42 +0300
Subject: [PATCH] libfprint: update, remove git version

---
 .../libraries/libfprint/default.nix           |  8 +++---
 .../libraries/libfprint/master.nix            | 26 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/libraries/libfprint/master.nix

diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index ffbed794599..aad6214f2d4 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, libusb, glib, nss, nspr, gdk_pixbuf }:
+{ stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = "libfprint-0.5.1";
+  name = "libfprint-0.6.0";
 
   src = fetchurl {
     url = "http://people.freedesktop.org/~hadess/${name}.tar.xz";
-    sha256 = "1cwgaswqcvvbclahk2m2qr09k7lf7l8jwvgf3svq92w8j4xmc4kd";
+    sha256 = "1giwh2z63mn45galsjb59rhyrvgwcy01hvvp4g01iaa2snvzr0r5";
   };
 
-  buildInputs = [ libusb glib nss nspr gdk_pixbuf ];
+  buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ];
   nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
diff --git a/pkgs/development/libraries/libfprint/master.nix b/pkgs/development/libraries/libfprint/master.nix
deleted file mode 100644
index 06d033d0c02..00000000000
--- a/pkgs/development/libraries/libfprint/master.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchgit, libtool, autoconf, automake113x, pkgconfig, libusb, glib, nss, nspr, pixman }:
-
-stdenv.mkDerivation rec {
-  name = "libfprint";
-
-  src = fetchgit {
-    url = "git://anongit.freedesktop.org/libfprint/libfprint";
-    rev = "a3c90f2b24434aa36f782aca3950fd89af01fce0";
-    sha256 = "01qa58vq299xzxzxrcqkl51k8396wh56674d9wjmkv2msxx877hi";
-  };
-
-  buildInputs = [ libusb glib nss nspr pixman ];
-  nativeBuildInputs = [ libtool autoconf automake113x pkgconfig ];
-
-  configureScript = "./autogen.sh";
-
-  configureFlags = [ "--prefix=$(out)" "--disable-examples-build" "--disable-x11-examples-build" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.freedesktop.org/wiki/Software/fprint/libfprint/";
-    description = "A library designed to make it easy to add support for consumer fingerprint readers";
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e099d17fb1..c42da184bd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6319,7 +6319,7 @@ let
     extraOnly = true;
   };
 
-  libfprint = callPackage ../development/libraries/libfprint/master.nix { };
+  libfprint = callPackage ../development/libraries/libfprint { };
 
   libfpx = callPackage ../development/libraries/libfpx { };