nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 17:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fprintd: nixfmt; move to by-name; fprintd-tod: nixfmt; move to by-name; libprint: nixfmt; move to by-name

Browse Source
This commit is contained in:
wxt 2024-09-25 15:48:57 +08:00
parent 46615171d8
commit ec5881151c
No known key found for this signature in database
GPG Key ID: 8281D5EE2D1825A4
6 changed files with 127 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
pkgs/by-name/fp/fprintd-tod/package.nix Normal file
View File

@ -0,0 +1,59 @@
{
lib,
fetchFromGitLab,
fetchpatch,
fprintd,
libfprint-tod,
}:
(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: finalAttrs:{
pname = "fprintd-tod";
version = "1.90.9";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libfprint";
repo = "fprintd";
rev = "v${finalAttrs.version}";
sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg=";
};
patches = oldAttrs.patches or [ ] ++ [
(fetchpatch {
name = "use-more-idiomatic-correct-embedded-shell-scripting";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch";
sha256 = "sha256-4uPrYEgJyXU4zx2V3gwKKLaD6ty0wylSriHlvKvOhek=";
})
(fetchpatch {
name = "remove-pointless-copying-of-files-into-build-directory";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch";
sha256 = "sha256-2pZBbMF1xjoDKn/jCAIldbeR2JNEVduXB8bqUrj2Ih4=";
})
(fetchpatch {
name = "build-Do-not-use-positional-arguments-in-i18n.merge_file";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/50943b1bd4f18d103c35233f0446ce7a31d1817e.patch";
sha256 = "sha256-ANkAq6fr0VRjkS0ckvf/ddVB2mH4b2uJRTI4H8vPPes=";
})
(fetchpatch {
name = "tests-Fix-dbusmock-AddDevice-calls-to-include-option";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa989720279e5558c3b8ff9ebe1959b1cf36.patch";
sha256 = "sha256-jW5vlzrbZQ1gUDLBf7G50GnZfZxhlnL2Eu+9Bghdwdw=";
})
];
postPatch =
oldAttrs.postPatch or ""
+ ''
# part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming
mv src/device.xml src/net.reactivated.Fprint.Device.xml
mv src/manager.xml src/net.reactivated.Fprint.Manager.xml
'';
meta = {
homepage = "https://fprint.freedesktop.org/";
description = "fprintd built with libfprint-tod to support Touch OEM Drivers";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ hmenke ];
};
})

73
pkgs/tools/security/fprintd/default.nix → pkgs/by-name/fp/fprintd/package.nix
View File

@ -1,37 +1,42 @@
{ lib, stdenv
, fetchFromGitLab
, pkg-config
, gobject-introspection
, meson
, ninja
, perl
, gettext
, gtk-doc
, libxslt
, docbook-xsl-nons
, docbook_xml_dtd_412
, glib
, gusb
, dbus
, polkit
, nss
, pam
, systemd
, libfprint
, python3
{
lib,
stdenv,
fetchFromGitLab,
pkg-config,
gobject-introspection,
meson,
ninja,
perl,
gettext,
gtk-doc,
libxslt,
docbook-xsl-nons,
docbook_xml_dtd_412,
glib,
gusb,
dbus,
polkit,
nss,
pam,
systemd,
libfprint,
python3,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "fprintd";
version = "1.94.4";
outputs = [ "out" "devdoc" ];
outputs = [
"out"
"devdoc"
];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libfprint";
repo = pname;
rev = "v${version}";
sha256 = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
repo = "fprintd";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
};
nativeBuildInputs = [
@ -41,6 +46,7 @@ stdenv.mkDerivation rec {
perl # for pod2man
gettext
gtk-doc
python3
libxslt
dbus
docbook-xsl-nons
@ -81,11 +87,10 @@ stdenv.mkDerivation rec {
# FIXME: Ugly hack for tests to find libpam_wrapper.so
LIBRARY_PATH = lib.makeLibraryPath [ python3.pkgs.pypamtest ];
doCheck = true;
mesonCheckFlags = [
# PAM related checks are timing out
"--no-suite" "fprintd:TestPamFprintd"
"--no-suite"
"fprintd:TestPamFprintd"
];
patches = [
@ -107,11 +112,11 @@ stdenv.mkDerivation rec {
--replace "'G_DEBUG=fatal-criticals'," ""
'';
meta = with lib; {
meta = {
homepage = "https://fprint.freedesktop.org/";
description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ abbradar ];
};
}
})

0
pkgs/tools/security/fprintd/skip-test-test_removal_during_enroll.patch → pkgs/by-name/fp/fprintd/skip-test-test_removal_during_enroll.patch
View File

53
pkgs/development/libraries/libfprint/default.nix → pkgs/by-name/li/libfprint/package.nix
View File

@ -1,31 +1,36 @@
{ lib, stdenv
, fetchFromGitLab
, pkg-config
, meson
, python3
, ninja
, gusb
, pixman
, glib
, nss
, gobject-introspection
, cairo
, libgudev
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
{
lib,
stdenv,
fetchFromGitLab,
pkg-config,
meson,
python3,
ninja,
gusb,
pixman,
glib,
nss,
gobject-introspection,
cairo,
libgudev,
gtk-doc,
docbook-xsl-nons,
docbook_xml_dtd_43,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs:{
pname = "libfprint";
version = "1.94.6";
outputs = [ "out" "devdoc" ];
outputs = [
"out"
"devdoc"
];
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libfprint";
repo = pname;
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-lDnAXWukBZSo8X6UEVR2nOMeVUi/ahnJgx2cP+vykZ8=";
};
@ -82,11 +87,11 @@ stdenv.mkDerivation rec {
runHook postInstallCheck
'';
meta = with lib; {
meta = {
homepage = "https://fprint.freedesktop.org/";
description = "Library designed to make it easy to add support for consumer fingerprint readers";
license = licenses.lgpl21Only;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
license = lib.licenses.lgpl21Only;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ abbradar ];
};
}
})

56
pkgs/tools/security/fprintd/tod.nix
View File

@ -1,56 +0,0 @@
{ lib
, fetchFromGitLab
, fetchpatch
, fprintd
, libfprint-tod
}:
(fprintd.override { libfprint = libfprint-tod; }).overrideAttrs (oldAttrs: rec {
pname = "fprintd-tod";
version = "1.90.9";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libfprint";
repo = "fprintd";
rev = "v${version}";
sha256 = "sha256-rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg=";
};
patches = oldAttrs.patches or [] ++ [
(fetchpatch {
name = "use-more-idiomatic-correct-embedded-shell-scripting";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f4256533d1ffdc203c3f8c6ee42e8dcde470a93f.patch";
sha256 = "sha256-4uPrYEgJyXU4zx2V3gwKKLaD6ty0wylSriHlvKvOhek=";
})
(fetchpatch {
name = "remove-pointless-copying-of-files-into-build-directory";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/2c34cef5ef2004d8479475db5523c572eb409a6b.patch";
sha256 = "sha256-2pZBbMF1xjoDKn/jCAIldbeR2JNEVduXB8bqUrj2Ih4=";
})
(fetchpatch {
name = "build-Do-not-use-positional-arguments-in-i18n.merge_file";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/50943b1bd4f18d103c35233f0446ce7a31d1817e.patch";
sha256 = "sha256-ANkAq6fr0VRjkS0ckvf/ddVB2mH4b2uJRTI4H8vPPes=";
})
(fetchpatch {
name = "tests-Fix-dbusmock-AddDevice-calls-to-include-option";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa989720279e5558c3b8ff9ebe1959b1cf36.patch";
sha256 = "sha256-jW5vlzrbZQ1gUDLBf7G50GnZfZxhlnL2Eu+9Bghdwdw=";
})
];
postPatch = oldAttrs.postPatch or "" + ''
# part of "remove-pointless-copying-of-files-into-build-directory" but git-apply doesn't handle renaming
mv src/device.xml src/net.reactivated.Fprint.Device.xml
mv src/manager.xml src/net.reactivated.Fprint.Manager.xml
'';
meta = {
homepage = "https://fprint.freedesktop.org/";
description = "fprintd built with libfprint-tod to support Touch OEM Drivers";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ hmenke ];
};
})

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

@ -7586,10 +7586,6 @@ with pkgs;
fpm = callPackage ../tools/package-management/fpm { };
fprintd = callPackage ../tools/security/fprintd { };
fprintd-tod = callPackage ../tools/security/fprintd/tod.nix { };
ferdium = callPackage ../applications/networking/instant-messengers/ferdium {
mkFranzDerivation = callPackage ../applications/networking/instant-messengers/franz/generic.nix { };
};
@ -20675,8 +20671,6 @@ with pkgs;
extraOnly = true;
};
libfprint = callPackage ../development/libraries/libfprint { };
libfprint-tod = callPackage ../development/libraries/libfprint-tod { };
libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { };