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

Merge pull request #52092 from gnidorah/fprint

Browse Source 
fprint: update packages
This commit is contained in:
Renaud 2018-12-18 14:06:22 +01:00 committed by GitHub
commit 52ea0af297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,22 +1,29 @@
{ stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }: { stdenv, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3
, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libfprint-0.7.0"; name = "libfprint-${version}";
version = "0.99.0";
src = fetchurl { src = fetchurl {
url = "https://people.freedesktop.org/~anarsoul/${name}.tar.xz"; url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz";
sha256 = "1wzi12zvdp8sw3w5pfbd9cwz6c71627bkr88rxv6gifbyj6fwgl6"; sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187";
}; };
buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ]; buildInputs = [ libusb pixman glib nss gtk3 ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ];
configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ];
preConfigure = ''
substituteInPlace libfprint/meson.build \
--replace /bin/echo ${coreutils}/bin/echo
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/fprint/libfprint/; homepage = https://fprint.freedesktop.org/;
description = "A library designed to make it easy to add support for consumer fingerprint readers"; description = "A library designed to make it easy to add support for consumer fingerprint readers";
license = licenses.lgpl2; license = licenses.lgpl21;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
}; };

24
pkgs/tools/security/fprint_demo/default.nix
View File

@ -1,24 +0,0 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, libfprint, gtk2 }:
stdenv.mkDerivation rec {
name = "fprint_demo-2008-03-03";
src = fetchgit {
url = "git://github.com/dsd/fprint_demo";
rev = "5d86c3f778bf97a29b73bdafbebd1970e560bfb0";
sha256 = "1rysqd8kdqgis1ykrbkiy1bcxav3vna8zdgbamyxw4hj5764xdcm";
};
buildInputs = [ libfprint gtk2 ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
hardeningDisable = [ "format" ];
meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/fprint/fprint_demo/;
description = "A simple GTK+ application to demonstrate and test libfprint's capabilities";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};
}

8
pkgs/tools/security/fprintd/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fprintd-${version}"; name = "fprintd-${version}";
version = "0.8.0"; version = "0.8.1";
src = fetchurl { src = fetchurl {
url = "https://people.freedesktop.org/~hadess/${name}.tar.xz"; url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/fprintd-${version}.tar.xz";
sha256 = "00i21ycaya4x2qf94mys6s94xnbj5cfm8zhhd5sc91lvqjk4r99k"; sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l";
}; };
buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ]; buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ];
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ]; configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/fprint/fprintd/; homepage = https://fprint.freedesktop.org/;
description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;

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

@ -2756,8 +2756,6 @@ in
fprintd = callPackage ../tools/security/fprintd { }; fprintd = callPackage ../tools/security/fprintd { };
fprint_demo = callPackage ../tools/security/fprint_demo { };
franz = callPackage ../applications/networking/instant-messengers/franz { }; franz = callPackage ../applications/networking/instant-messengers/franz { };
freedroidrpg = callPackage ../games/freedroidrpg { }; freedroidrpg = callPackage ../games/freedroidrpg { };