diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2020-01-25 22:54:37 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2020-01-25 22:56:12 +0300 |
| commit | ea77cad56976f554bde3ef7d718de78a63eb7b50 (patch) | |
| tree | ed211d66aabb516b3982c55f7fdced46d2ca8648 /pkgs/development/libraries/libfprint/default.nix | |
| parent | 8cd9059f9ef4a0e37695219614ea242d0a94b959 (diff) | |
| download | nixlib-ea77cad56976f554bde3ef7d718de78a63eb7b50.tar nixlib-ea77cad56976f554bde3ef7d718de78a63eb7b50.tar.gz nixlib-ea77cad56976f554bde3ef7d718de78a63eb7b50.tar.bz2 nixlib-ea77cad56976f554bde3ef7d718de78a63eb7b50.tar.lz nixlib-ea77cad56976f554bde3ef7d718de78a63eb7b50.tar.xz nixlib-ea77cad56976f554bde3ef7d718de78a63eb7b50.tar.zst nixlib-ea77cad56976f554bde3ef7d718de78a63eb7b50.zip | |
Revert "Added support for libfprint 1.90"
This reverts commit b60d5692bf44337bc2081caf634ac3b60a8512e5.
Diffstat (limited to 'pkgs/development/libraries/libfprint/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libfprint/default.nix | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 6819ffba21c3..9a6db72ae058 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -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 }: +assert thinkpad -> openssl != null; + stdenv.mkDerivation rec { - pname = "libfprint"; - version = "1.90"; + pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad"; + version = "1.0"; - src = fetchurl { - url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/1bba17b5daa130aa548bc7ea96dc58c4/libfprint-1.90.0.tar.xz"; - sha256 = "930f530df369ff874d7971f0b7c7bdb7c81597e91af4668694b98fe30b4b3371"; - }; + 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" |