Merge pull request #146737 from ymatsiuk/fprintd

fprintd-tod: fix the build
This commit is contained in:
Alexander Bantyev 2021-11-21 11:31:21 +03:00 committed by GitHub
commit 8aec79b615
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 3 deletions

View file

@ -0,0 +1,21 @@
{ fetchFromGitLab
, fprintd
, libfprint-tod
}:
(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs:
let
pname = "fprintd-tod";
version = "1.90.9";
in
{
inherit pname version;
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libfprint";
repo = "${oldAttrs.pname}";
rev = "v${version}";
sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg=";
};
})

View file

@ -5305,9 +5305,7 @@ with pkgs;
fprintd = callPackage ../tools/security/fprintd { };
fprintd-tod = callPackage ../tools/security/fprintd {
libfprint = libfprint-tod;
};
fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { };
ferdi = callPackage ../applications/networking/instant-messengers/ferdi {
mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };