fprintd: 1.90.1 → 1.90.9
https://gitlab.freedesktop.org/libfprint/fprintd/-/blob/v1.90.9/NEWS#L1-73
This commit is contained in:
parent
032ed6ca4b
commit
aedef77f10
|
@ -1,7 +1,7 @@
|
||||||
{ lib, stdenv
|
{ lib, stdenv
|
||||||
, fetchFromGitLab
|
, fetchFromGitLab
|
||||||
, fetchpatch
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
, gobject-introspection
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, perl
|
, perl
|
||||||
|
@ -11,9 +11,10 @@
|
||||||
, libxslt
|
, libxslt
|
||||||
, docbook-xsl-nons
|
, docbook-xsl-nons
|
||||||
, docbook_xml_dtd_412
|
, docbook_xml_dtd_412
|
||||||
|
, fetchurl
|
||||||
, glib
|
, glib
|
||||||
|
, gusb
|
||||||
, dbus
|
, dbus
|
||||||
, dbus-glib
|
|
||||||
, polkit
|
, polkit
|
||||||
, nss
|
, nss
|
||||||
, pam
|
, pam
|
||||||
|
@ -24,52 +25,41 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fprintd";
|
pname = "fprintd";
|
||||||
version = "1.90.1";
|
version = "1.90.9";
|
||||||
outputs = [ "out" "devdoc" ];
|
outputs = [ "out" "devdoc" ];
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
domain = "gitlab.freedesktop.org";
|
domain = "gitlab.freedesktop.org";
|
||||||
owner = "libfprint";
|
owner = "libfprint";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = "v${version}";
|
||||||
sha256 = "0mbzk263x7f58i9cxhs44mrngs7zw5wkm62j5r6xlcidhmfn03cg";
|
sha256 = "rOTVThHOY/Q2IIu2RGiv26UE2V/JFfWWnfKZQfKl5Mg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fixes issue with ":" when there is multiple paths (might be the case on NixOS)
|
|
||||||
# https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/50
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/d7fec03f24d10f88d34581c72f0eef201f5eafac.patch";
|
|
||||||
sha256 = "0f88dhizai8jz7hpm5lpki1fx4593zcy89iwi4brsqbqc7jp9ls0";
|
|
||||||
})
|
|
||||||
|
|
||||||
# Fix locating libpam_wrapper for tests
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/merge_requests/40.patch";
|
|
||||||
sha256 = "0qqy090p93lzabavwjxzxaqidkcb3ifacl0d3yh1q7ms2a58yyz3";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/f401f399a85dbeb2de165b9b9162eb552ab6eea7.patch";
|
|
||||||
sha256 = "1bc9g6kc95imlcdpvp8qgqjsnsxg6nipr6817c1pz5i407yvw1iy";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
perl
|
perl # for pod2man
|
||||||
gettext
|
gettext
|
||||||
gtk-doc
|
gtk-doc
|
||||||
libxslt
|
libxslt
|
||||||
dbus
|
# TODO: apply this to D-Bus so that other packages can benefit.
|
||||||
|
# https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/202
|
||||||
|
(dbus.overrideAttrs (attrs: {
|
||||||
|
postInstall = attrs.postInstall or "" + ''
|
||||||
|
ln -s ${fetchurl {
|
||||||
|
url = "https://gitlab.freedesktop.org/dbus/dbus/-/raw/b207135dbd8c09cf8da28f7e3b0a18bb11483663/doc/catalog.xml";
|
||||||
|
sha256 = "1/43XwAIcmRXfM4OXOPephyQyUnW8DSveiZbiPvW72I=";
|
||||||
|
}} $out/share/xml/dbus-1/catalog.xml
|
||||||
|
'';
|
||||||
|
}))
|
||||||
docbook-xsl-nons
|
docbook-xsl-nons
|
||||||
docbook_xml_dtd_412
|
docbook_xml_dtd_412
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib
|
glib
|
||||||
dbus-glib
|
|
||||||
polkit
|
polkit
|
||||||
nss
|
nss
|
||||||
pam
|
pam
|
||||||
|
@ -78,11 +68,13 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
checkInputs = with python3.pkgs; [
|
checkInputs = with python3.pkgs; [
|
||||||
|
gobject-introspection # for setup hook
|
||||||
python-dbusmock
|
python-dbusmock
|
||||||
dbus-python
|
dbus-python
|
||||||
pygobject3
|
pygobject3
|
||||||
pycairo
|
pycairo
|
||||||
pypamtest
|
pypamtest
|
||||||
|
gusb # Required by libfprint’s typelib
|
||||||
];
|
];
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
|
@ -103,13 +95,15 @@ stdenv.mkDerivation rec {
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs po/check-translations.sh
|
patchShebangs \
|
||||||
|
po/check-translations.sh \
|
||||||
|
tests/unittest_inspector.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://fprint.freedesktop.org/";
|
homepage = "https://fprint.freedesktop.org/";
|
||||||
description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
|
description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ abbradar elyhaka ];
|
maintainers = with maintainers; [ abbradar elyhaka ];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue