diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-17 20:15:57 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-17 20:15:57 -0400 |
| commit | e2644036f63b323c3c2138d779a19c08e0f415bb (patch) | |
| tree | 39d7ac9fc309ef60eb10f27fc978863ca8ec0a90 /pkgs/tools/security/fprintd | |
| parent | 7854b86d46d6e9cbb701c0d256c42fcd18a16e1b (diff) | |
| download | nixpkgs-e2644036f63b323c3c2138d779a19c08e0f415bb.tar nixpkgs-e2644036f63b323c3c2138d779a19c08e0f415bb.tar.gz nixpkgs-e2644036f63b323c3c2138d779a19c08e0f415bb.tar.bz2 nixpkgs-e2644036f63b323c3c2138d779a19c08e0f415bb.tar.lz nixpkgs-e2644036f63b323c3c2138d779a19c08e0f415bb.tar.xz nixpkgs-e2644036f63b323c3c2138d779a19c08e0f415bb.tar.zst nixpkgs-e2644036f63b323c3c2138d779a19c08e0f415bb.zip | |
fprintd: 0.8.1 -> 0.9.0
Resolves issues with StateDirectory not being set in systemd unit. https://gitlab.freedesktop.org/libfprint/fprintd/-/tags/V_0_9_0
Diffstat (limited to 'pkgs/tools/security/fprintd')
| -rw-r--r-- | pkgs/tools/security/fprintd/default.nix | 49 |
1 files changed, 36 insertions, 13 deletions
diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 84727f55b93..201780b1492 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,26 +1,49 @@ { thinkpad ? false -, stdenv, fetchurl, pkgconfig, intltool, libfprint-thinkpad ? null -, libfprint ? null, glib, dbus-glib, polkit, nss, pam, systemd }: +, stdenv +, fetchurl +, 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"; }; - 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" - "--sysconfdir=${placeholder "out"}/etc" + configureFlags = [ + # 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; { |