diff options
author | Elmo Todurov <elmo.todurov@eesti.ee> | 2019-05-15 23:56:58 +0300 |
---|---|---|
committer | Elmo Todurov <elmo.todurov@eesti.ee> | 2019-05-20 20:48:30 +0300 |
commit | 432944cdb375a19493970010a77146711c02e753 (patch) | |
tree | 3603595e84698ae236240d2f4a42a10494a08da3 | |
parent | 394b43f1fd8a937798c99a9eb4a380f479c39d5b (diff) | |
download | nixlib-432944cdb375a19493970010a77146711c02e753.tar nixlib-432944cdb375a19493970010a77146711c02e753.tar.gz nixlib-432944cdb375a19493970010a77146711c02e753.tar.bz2 nixlib-432944cdb375a19493970010a77146711c02e753.tar.lz nixlib-432944cdb375a19493970010a77146711c02e753.tar.xz nixlib-432944cdb375a19493970010a77146711c02e753.tar.zst nixlib-432944cdb375a19493970010a77146711c02e753.zip |
fprintd: added option to use fork for Lenovo ThinkPad
-rw-r--r-- | nixos/modules/services/security/fprintd.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/security/fprintd/default.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 22 insertions, 5 deletions
diff --git a/nixos/modules/services/security/fprintd.nix b/nixos/modules/services/security/fprintd.nix index 9ed7f2a2efd9..8ece1ca19013 100644 --- a/nixos/modules/services/security/fprintd.nix +++ b/nixos/modules/services/security/fprintd.nix @@ -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 ]; - systemd.packages = [ pkgs.fprintd ]; + systemd.packages = [ cfg.package ]; }; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 65eec89a09fc..b43be1a69240 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, intltool -, libfprint, glib, dbus-glib, polkit, nss, pam, systemd }: +{ thinkpad ? false +, stdenv, fetchurl, pkgconfig, intltool, libfprint-thinkpad ? null +, libfprint ? null, glib, dbus-glib, polkit, nss, pam, systemd }: stdenv.mkDerivation rec { - name = "fprintd-${version}"; + pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad"; version = "0.8.1"; src = fetchurl { @@ -10,7 +11,10 @@ stdenv.mkDerivation rec { 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 ]; configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9655363a90d..fb8c8be60a93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2981,6 +2981,9 @@ in fprot = callPackage ../tools/security/fprot { }; fprintd = callPackage ../tools/security/fprintd { }; + fprintd-thinkpad = fprintd.override { + thinkpad = true; + }; franz = callPackage ../applications/networking/instant-messengers/franz { }; |