Merge pull request #74656 from Elyhaka/master

libfprint: 1.0 -> 1.90
This commit is contained in:
Jörg Thalheim
2019-12-01 15:54:46 +00:00
committed by GitHub
4 changed files with 19 additions and 43 deletions

View File

@@ -1,11 +1,9 @@
{ thinkpad ? false
, stdenv
{ stdenv
, fetchurl
, fetchpatch
, pkgconfig
, intltool
, libfprint-thinkpad ? null
, libfprint ? null
, libfprint
, glib
, dbus-glib
, polkit
@@ -17,7 +15,7 @@
}:
stdenv.mkDerivation rec {
pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad";
pname = "fprintd";
version = "0.9.0";
src = fetchurl {
@@ -46,10 +44,8 @@ stdenv.mkDerivation rec {
nss
pam
systemd
]
++ stdenv.lib.optional thinkpad libfprint-thinkpad
++ stdenv.lib.optional (!thinkpad) libfprint
;
libfprint
];
configureFlags = [
# is hardcoded to /var/lib/fprint, this is for the StateDirectory install target