public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fprintd: Move D-Bus conf file to share/dbus-1/system.d

Browse Source 
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
This commit is contained in:
worldofpeace 2019-09-15 23:17:54 -04:00
parent ad6aada7e2
commit d6d3ccf8b8
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/security/fprintd/default.nix
View File

@ -1,6 +1,6 @@
{ thinkpad ? false { thinkpad ? false
, stdenv, fetchurl, pkgconfig, intltool, libfprint-thinkpad ? null , stdenv, fetchurl, pkgconfig, intltool, libfprint-thinkpad ? null
, libfprint ? null, glib, dbus-glib, polkit, nss, pam, systemd }: , libfprint ? null, glib, dbus-glib, polkit, nss, pam, systemd, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad"; pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad";
@ -11,16 +11,23 @@ stdenv.mkDerivation rec {
sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l"; sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l";
}; };
patches = [
(fetchpatch {
url = "https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/16.patch";
sha256 = "1y39zsmxjll9hip8464qwhq5qg06c13pnafyafgxdph75lvhdll7";
})
];
buildInputs = [ glib dbus-glib polkit nss pam systemd ] buildInputs = [ glib dbus-glib polkit nss pam systemd ]
++ stdenv.lib.optional thinkpad libfprint-thinkpad ++ stdenv.lib.optional thinkpad libfprint-thinkpad
++ stdenv.lib.optional (!thinkpad) libfprint; ++ stdenv.lib.optional (!thinkpad) libfprint;
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
configureFlags = [ configureFlags = [
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--localstatedir=/var" "--localstatedir=/var"
"--sysconfdir=${placeholder "out"}/etc" "--sysconfdir=${placeholder "out"}/etc"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {