Revert "Added support for libfprint 1.90"

This reverts commit b60d5692bf.
This commit is contained in:
gnidorah
2020-01-25 22:56:12 +03:00
parent 8cd9059f9e
commit ea77cad569
4 changed files with 44 additions and 20 deletions
@@ -1,27 +1,41 @@
{ stdenv
{ thinkpad ? false
, stdenv
, fetchFromGitHub
, fetchurl
, pkgconfig
, meson
, ninja
, gusb
, libusb
, pixman
, glib
, nss
, gobject-introspection
, gtk3
, coreutils
, gtk-doc
, docbook_xsl
, docbook_xml_dtd_43
, openssl ? null
}:
stdenv.mkDerivation rec {
pname = "libfprint";
version = "1.90";
assert thinkpad -> openssl != null;
src = fetchurl {
url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/1bba17b5daa130aa548bc7ea96dc58c4/libfprint-1.90.0.tar.xz";
sha256 = "930f530df369ff874d7971f0b7c7bdb7c81597e91af4668694b98fe30b4b3371";
};
stdenv.mkDerivation rec {
pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad";
version = "1.0";
src = {
libfprint-thinkpad =
fetchFromGitHub {
owner = "3v1n0";
repo = "libfprint";
rev = "2e2e3821717e9042e93a995bdbd3d00f2df0be9c";
sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b";
};
libfprint = fetchurl {
url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz";
sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd";
};
}.${pname};
nativeBuildInputs = [
pkgconfig
@@ -30,15 +44,17 @@ stdenv.mkDerivation rec {
gtk-doc
docbook_xsl
docbook_xml_dtd_43
gobject-introspection
];
buildInputs = [
gusb
libusb
pixman
glib
nss
];
gtk3
]
++ stdenv.lib.optional thinkpad openssl
;
mesonFlags = [
"-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"