MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #68995 from worldofpeace/bump/libfprint

Browse source 
fprintd: 0.8.1 -> 0.9.0, libfprint: 0.99 -> 1.0
This commit is contained in:
worldofpeace 2019-10-01 05:38:33 +00:00 committed by GitHub
commit db96124d3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 79 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/security/fprintd.nix
View file

@ -50,13 +50,6 @@ in
systemd.packages = [ cfg.package ];
# The upstream unit does not use StateDirectory, and will
# fail if the directory it needs is not present. Should be
# fixed when https://gitlab.freedesktop.org/libfprint/fprintd/merge_requests/5
# is merged.
systemd.services.fprintd.serviceConfig.StateDirectory = "fprint";
};
}

53
pkgs/development/libraries/libfprint/default.nix
View file

@ -1,11 +1,27 @@
{ thinkpad ? false, stdenv, fetchFromGitHub, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3
, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43, openssl ? null }:
{ thinkpad ? false
, stdenv
, fetchFromGitHub
, fetchurl
, pkgconfig
, meson
, ninja
, libusb
, pixman
, glib
, nss
, gtk3
, coreutils
, gtk-doc
, docbook_xsl
, docbook_xml_dtd_43
, openssl ? null
}:
assert thinkpad -> openssl != null;
stdenv.mkDerivation rec {
pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad";
version = "0.99.0";
version = "1.0";
src = {
libfprint-thinkpad =
@ -16,19 +32,36 @@ stdenv.mkDerivation rec {
sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b";
};
libfprint = fetchurl {
url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz";
sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187";
url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz";
sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd";
};
}.${pname};
buildInputs = [ libusb pixman glib nss gtk3 ]
++ stdenv.lib.optional thinkpad openssl;
nativeBuildInputs = [
pkgconfig
meson
ninja
gtk-doc
docbook_xsl
docbook_xml_dtd_43
];
nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ];
buildInputs = [
libusb
pixman
glib
nss
gtk3
]
++ stdenv.lib.optional thinkpad openssl
;
mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ];
mesonFlags = [
"-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
"-Dx11-examples=false"
];
preConfigure = ''
postPatch = ''
substituteInPlace libfprint/meson.build \
--replace /bin/echo ${coreutils}/bin/echo
'';

49
pkgs/tools/security/fprintd/default.nix
View file

@ -1,26 +1,49 @@
{ thinkpad ? false
, stdenv, fetchurl, pkgconfig, intltool, libfprint-thinkpad ? null
, libfprint ? null, glib, dbus-glib, polkit, nss, pam, systemd }:
, stdenv
, fetchurl
, pkgconfig
, intltool
, libfprint-thinkpad ? null
, libfprint ? null
, glib
, dbus-glib
, polkit
, nss
, pam
, systemd
}:
stdenv.mkDerivation rec {
pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad";
version = "0.8.1";
version = "0.9.0";
src = fetchurl {
url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/fprintd-${version}.tar.xz";
sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l";
url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/9dec4b63d1f00e637070be1477ce63c0/fprintd-${version}.tar.xz";
sha256 = "182gcnwb6zjwmk0dn562rjmpbk7ac7dhipbfdhfic2sn1jzis49p";
};
buildInputs = [ glib dbus-glib polkit nss pam systemd ]
++ stdenv.lib.optional thinkpad libfprint-thinkpad
++ stdenv.lib.optional (!thinkpad) libfprint;
nativeBuildInputs = [
intltool
pkgconfig
];
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
glib
dbus-glib
polkit
nss
pam
systemd
]
++ stdenv.lib.optional thinkpad libfprint-thinkpad
++ stdenv.lib.optional (!thinkpad) libfprint
;
configureFlags = [
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--localstatedir=/var"
"--sysconfdir=${placeholder "out"}/etc"
configureFlags = [
# is hardcoded to /var/lib/fprint, this is for the StateDirectory install target
"--localstatedir=${placeholder "out"}/var"
"--sysconfdir=${placeholder "out"}/etc"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
];
meta = with stdenv.lib; {