From 6b77a7f8bfb507eb5cd16c41068a885b2630c3b6 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 14 Dec 2018 20:27:50 +0300 Subject: [PATCH 1/3] fprint_demo: drop package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://fprint.freedesktop.org/ fprint_demo is obsolete. Most features are integrated into fprintd’s helpers, and libfprint has an examples section --- pkgs/tools/security/fprint_demo/default.nix | 24 --------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/tools/security/fprint_demo/default.nix diff --git a/pkgs/tools/security/fprint_demo/default.nix b/pkgs/tools/security/fprint_demo/default.nix deleted file mode 100644 index 2179b2b7b03..00000000000 --- a/pkgs/tools/security/fprint_demo/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05dbfacb628..7a4ea7aecd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2750,8 +2750,6 @@ in fprintd = callPackage ../tools/security/fprintd { }; - fprint_demo = callPackage ../tools/security/fprint_demo { }; - franz = callPackage ../applications/networking/instant-messengers/franz { }; freedroidrpg = callPackage ../games/freedroidrpg { }; From 26f6c15a42e8015a5332925719f45c8992a2fc9c Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 14 Dec 2018 21:13:35 +0300 Subject: [PATCH 2/3] fprintd: 0.8.0 -> 0.8.1 --- pkgs/tools/security/fprintd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index d0cf2f8091e..65eec89a09f 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fprintd-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://people.freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "00i21ycaya4x2qf94mys6s94xnbj5cfm8zhhd5sc91lvqjk4r99k"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/fprintd-${version}.tar.xz"; + sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l"; }; 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" ]; 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"; license = licenses.gpl2; platforms = platforms.linux; From 024ad6c4d5899bbbd2841a7b41e9c2f81719badf Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 17 Dec 2018 21:04:26 +0300 Subject: [PATCH 3/3] libfprint: 0.7.0 -> 0.99.0 --- .../libraries/libfprint/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 8b384a51f01..3f3062e3c08 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -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 { - name = "libfprint-0.7.0"; + name = "libfprint-${version}"; + version = "0.99.0"; src = fetchurl { - url = "https://people.freedesktop.org/~anarsoul/${name}.tar.xz"; - sha256 = "1wzi12zvdp8sw3w5pfbd9cwz6c71627bkr88rxv6gifbyj6fwgl6"; + url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz"; + sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187"; }; - buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb pixman glib nss gtk3 ]; + 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; { - 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"; - license = licenses.lgpl2; + license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; };