diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 01:47:08 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 01:47:08 +0200 |
| commit | b3fcd9375d89060979ce67d13c6714ebc3e1c002 (patch) | |
| tree | e5120c8684e77b7b579c5fd348915cecdca66c57 /pkgs/tools/security/fprintd | |
| parent | 3a4658ea04d66e849aa29c1f747ab8becc14949c (diff) | |
| parent | 3dc58eda52ef935313cd0418264abd1d30d6b4d3 (diff) | |
| download | nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.gz nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.bz2 nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.lz nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.xz nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.zst nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/security/fprintd')
| -rw-r--r-- | pkgs/tools/security/fprintd/default.nix | 46 |
1 files changed, 35 insertions, 11 deletions
diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 4f36dc30eed..ab2de77b6b1 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,14 +1,26 @@ { thinkpad ? false -, stdenv, fetchurl, pkgconfig, intltool, libfprint-thinkpad ? null -, libfprint ? null, glib, dbus-glib, polkit, nss, pam, systemd, fetchpatch }: +, stdenv +, fetchurl +, fetchpatch +, pkgconfig +, intltool +, libfprint-thinkpad ? null +, libfprint ? null +, glib +, dbus-glib +, polkit +, nss +, pam +, systemd +}: stdenv.mkDerivation rec { pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad"; - version = "0.8.1"; + version = "0.9.0"; src = fetchurl { - url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/fprintd-${version}.tar.xz"; - sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/9dec4b63d1f00e637070be1477ce63c0/fprintd-${version}.tar.xz"; + sha256 = "182gcnwb6zjwmk0dn562rjmpbk7ac7dhipbfdhfic2sn1jzis49p"; }; patches = [ @@ -18,16 +30,28 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ glib dbus-glib polkit nss pam systemd ] - ++ stdenv.lib.optional thinkpad libfprint-thinkpad - ++ stdenv.lib.optional (!thinkpad) libfprint; + nativeBuildInputs = [ + intltool + pkgconfig + ]; - nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ + glib + dbus-glib + polkit + nss + pam + systemd + ] + ++ stdenv.lib.optional thinkpad libfprint-thinkpad + ++ stdenv.lib.optional (!thinkpad) libfprint + ; configureFlags = [ - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - "--localstatedir=/var" + # is hardcoded to /var/lib/fprint, this is for the StateDirectory install target + "--localstatedir=${placeholder "out"}/var" "--sysconfdir=${placeholder "out"}/etc" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" ]; meta = with stdenv.lib; { |