JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libfprint: update, remove git version

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-03-29 05:02:42 +03:00
parent 731a4019d0
commit aa652e09d2
3 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libfprint/default.nix
View File

@ -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" ];

26
pkgs/development/libraries/libfprint/master.nix
View File

@ -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 ];
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -6319,7 +6319,7 @@ let
extraOnly = true;
};
libfprint = callPackage ../development/libraries/libfprint/master.nix { };
libfprint = callPackage ../development/libraries/libfprint { };
libfpx = callPackage ../development/libraries/libfpx { };