Merge pull request #104915 from grahamc/fprintd-libfprint-tod

{fprintd,libfprint}-tod: init, plus  libfprint-2-tod1-goodix: init at 0.0.6
This commit is contained in:
Graham Christensen 2021-03-30 14:55:24 +00:00 committed by GitHub
commit 83fccd0edb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 83 additions and 0 deletions

View File

@ -0,0 +1,35 @@
{ stdenv, lib, fetchgit, libfprint-tod }:
stdenv.mkDerivation {
pname = "libfprint-2-tod1-goodix";
version = "0.0.6";
src = fetchgit {
url = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix";
rev = "882735c6366fbe30149eea5cfd6d0ddff880f0e4"; # droped-lp1880058 on 20202-11-25
sha256 = "sha256-Uv+Rr4V31DyaZFOj79Lpyfl3G6zVWShh20roI0AvMPU=";
};
buildPhase = ''
patchelf \
--set-rpath ${lib.makeLibraryPath [ libfprint-tod ]} \
usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so
ldd usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so
'';
installPhase = ''
mkdir -p "$out/usr/lib/libfprint-2/tod-1/"
mkdir -p "$out/usr/lib/udev/rules.d/"
cp usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-$version.so "$out/usr/lib/libfprint-2/tod-1/"
cp lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules "$out/usr/lib/udev/rules.d/"
'';
meta = with lib; {
description = "Goodix driver module for libfprint-2-tod Touch OEM Driver";
homepage = "https://git.launchpad.net/~oem-solutions-engineers/libfprint-2-tod1-goodix/+git/libfprint-2-tod1-goodix/";
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ grahamc ];
};
}

View File

@ -0,0 +1,40 @@
{ lib
, libfprint
, fetchFromGitLab
}:
# for the curious, "tod" means "Touch OEM Drivers" meaning it can load
# external .so's.
libfprint.overrideAttrs ({ postPatch ? "", mesonFlags ? [], ... }: let
version = "1.90.7+git20210222+tod1";
in {
pname = "libfprint-tod";
inherit version;
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "3v1n0";
repo = "libfprint";
rev = "v${version}";
sha256 = "0cj7iy5799pchyzqqncpkhibkq012g3bdpn18pfb19nm43svhn4j";
};
mesonFlags = mesonFlags ++ [
"-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d"
];
postPatch = ''
${postPatch}
patchShebangs ./tests/*.py ./tests/*.sh
'';
meta = with lib; {
homepage = "https://gitlab.freedesktop.org/3v1n0/libfprint";
description = "A library designed to make it easy to add support for consumer fingerprint readers, with support for loaded drivers";
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = with maintainers; [ grahamc ];
};
})

View File

@ -4473,6 +4473,10 @@ in
fprintd = callPackage ../tools/security/fprintd { }; fprintd = callPackage ../tools/security/fprintd { };
fprintd-tod = callPackage ../tools/security/fprintd {
libfprint = libfprint-tod;
};
ferdi = callPackage ../applications/networking/instant-messengers/ferdi { ferdi = callPackage ../applications/networking/instant-messengers/ferdi {
mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { }; mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
}; };
@ -15237,6 +15241,10 @@ in
libfprint = callPackage ../development/libraries/libfprint { }; libfprint = callPackage ../development/libraries/libfprint { };
libfprint-tod = callPackage ../development/libraries/libfprint-tod { };
libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { };
libfpx = callPackage ../development/libraries/libfpx { }; libfpx = callPackage ../development/libraries/libfpx { };
libgadu = callPackage ../development/libraries/libgadu { }; libgadu = callPackage ../development/libraries/libgadu { };