Skip to content

Commit

Permalink
fprintd: 0.8.1 -> 0.9.0
Browse files Browse the repository at this point in the history
Resolves issues with StateDirectory not being set in
systemd unit.

https://gitlab.freedesktop.org/libfprint/fprintd/-/tags/V_0_9_0
  • Loading branch information
worldofpeace committed Sep 18, 2019
1 parent 7854b86 commit e264403
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 20 deletions.
7 changes: 0 additions & 7 deletions nixos/modules/services/security/fprintd.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@ in

systemd.packages = [ cfg.package ];


# The upstream unit does not use StateDirectory, and will
# fail if the directory it needs is not present. Should be
# fixed when https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/5
# is merged.
systemd.services.fprintd.serviceConfig.StateDirectory = "fprint";

};

}
49 changes: 36 additions & 13 deletions pkgs/tools/security/fprintd/default.nix
Original file line number Diff line number Diff line change
@@ -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; {
Expand Down

0 comments on commit e264403

Please sign in to comment.