Skip to content

Commit 756ae85

Browse files
[Backport release-26.05] libfprint: Add patches to support more hardware (#537265)
2 parents 3bf25a4 + c91d1f7 commit 756ae85

2 files changed

Lines changed: 34 additions & 0 deletions

File tree

pkgs/by-name/li/libfprint-tod/package.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ libfprint.overrideAttrs (
2727
hash = "sha256-xkywuFbt8EFJOlIsSN2hhZfMUhywdgJ/uT17uiO3YV4=";
2828
};
2929

30+
# Different source than libfprint, so override any patches, because they
31+
# would only apply to the original source tree
32+
patches = [ ];
33+
3034
mesonFlags = [
3135
# Include virtual drivers for fprintd tests
3236
"-Ddrivers=all"

pkgs/by-name/li/libfprint/package.nix

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
fetchFromGitLab,
5+
fetchpatch,
56
pkg-config,
67
meson,
78
python3,
@@ -35,6 +36,35 @@ stdenv.mkDerivation (finalAttrs: {
3536
hash = "sha256-aNBUIKY3PP5A07UNg3N0qq+2cwb6Fk67oKQcXgr2G/4=";
3637
};
3738

39+
patches = [
40+
# New hardware support since 1.94.10, just new USB Product IDs
41+
(fetchpatch {
42+
name = "realtek-3274-9003.patch";
43+
url = "https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/a25f71cf97820c51edc4c32f84686fcdc608d9d1.patch";
44+
sha256 = "sha256-T9rvT53Ij+5gtiVOp+xfzQwiVkyF0m6lZAUCXWmaugg=";
45+
})
46+
(fetchpatch {
47+
name = "elan-0c58.patch";
48+
url = "https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/4610f2285e6373c2fe4ead0dff4ebf8dabe4e532.patch";
49+
sha256 = "sha256-VR96V+7FvSa8sE6JpcCx/slZ0MaK9HLuNuAay2P9C6M=";
50+
})
51+
(fetchpatch {
52+
name = "elan-04F3-0C9C.patch";
53+
url = "https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/2bdc2b7ca6d8bedc675054934fbc8f8b6a21deac.patch";
54+
sha256 = "sha256-LFMip9Mq55uDRgHkW+XeI+j0mILOb7DIHscHjyKe4yE=";
55+
})
56+
(fetchpatch {
57+
name = "focal-077a-079a.patch";
58+
url = "https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/2c7842c905147a2d127c1b168b2e9d432b8c91a4.patch";
59+
sha256 = "sha256-PuISGITn0/6AWY0WVUfViZtdcQFh+0s+4OLIszqdLUs=";
60+
})
61+
(fetchpatch {
62+
name = "focal-a97a.patch";
63+
url = "https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/0dc384b90ed8cd78b3e8d7c0d30a953bd088b98c.patch";
64+
sha256 = "sha256-X/wl4MpxfQ7sLlFTkkiDQGyRFQ6lC9pdcy3XPrSeOZw=";
65+
})
66+
];
67+
3868
postPatch = ''
3969
patchShebangs \
4070
tests/test-runner.sh \

0 commit comments

Comments
 (0)