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

fprintd: added option to use fork for Lenovo ThinkPad

Browse Source
This commit is contained in:
Elmo Todurov 2019-05-15 23:56:58 +03:00
parent 394b43f1fd
commit 432944cdb3
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/security/fprintd.nix
View File

@ -25,6 +25,16 @@ in
''; '';
}; };
package = mkOption {
type = types.package;
default = pkgs.fprintd;
defaultText = "pkgs.fprintd";
example = "pkgs.fprintd-thinkpad";
description = ''
fprintd package to use.
'';
};
}; };
}; };
@ -38,7 +48,7 @@ in
environment.systemPackages = [ pkgs.fprintd ]; environment.systemPackages = [ pkgs.fprintd ];
systemd.packages = [ pkgs.fprintd ]; systemd.packages = [ cfg.package ];
}; };

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

@ -1,8 +1,9 @@
{ stdenv, fetchurl, pkgconfig, intltool { thinkpad ? false
, libfprint, 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 { stdenv.mkDerivation rec {
name = "fprintd-${version}"; pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad";
version = "0.8.1"; version = "0.8.1";
src = fetchurl { src = fetchurl {
@ -10,7 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l"; sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l";
}; };
buildInputs = [ libfprint 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;
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ]; configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ];

3
pkgs/top-level/all-packages.nix
View File

@ -2981,6 +2981,9 @@ in
fprot = callPackage ../tools/security/fprot { }; fprot = callPackage ../tools/security/fprot { };
fprintd = callPackage ../tools/security/fprintd { }; fprintd = callPackage ../tools/security/fprintd { };
fprintd-thinkpad = fprintd.override {
thinkpad = true;
};
franz = callPackage ../applications/networking/instant-messengers/franz { }; franz = callPackage ../applications/networking/instant-messengers/franz { };