diff options
| author | Elyhaka <57923898+Elyhaka@users.noreply.github.com> | 2019-11-29 18:34:29 +0100 |
|---|---|---|
| committer | Elyhaka <57923898+Elyhaka@users.noreply.github.com> | 2019-12-01 10:42:16 +0100 |
| commit | b60d5692bf44337bc2081caf634ac3b60a8512e5 (patch) | |
| tree | e8a4049a527cd10717e4e665fb0a740ac90f99d9 /pkgs/development/libraries/libfprint | |
| parent | 724133984f066ee7ad1592f08ae886a718eb31c6 (diff) | |
| download | nixpkgs-b60d5692bf44337bc2081caf634ac3b60a8512e5.tar nixpkgs-b60d5692bf44337bc2081caf634ac3b60a8512e5.tar.gz nixpkgs-b60d5692bf44337bc2081caf634ac3b60a8512e5.tar.bz2 nixpkgs-b60d5692bf44337bc2081caf634ac3b60a8512e5.tar.lz nixpkgs-b60d5692bf44337bc2081caf634ac3b60a8512e5.tar.xz nixpkgs-b60d5692bf44337bc2081caf634ac3b60a8512e5.tar.zst nixpkgs-b60d5692bf44337bc2081caf634ac3b60a8512e5.zip | |
Added support for libfprint 1.90
Diffstat (limited to 'pkgs/development/libraries/libfprint')
| -rw-r--r-- | pkgs/development/libraries/libfprint/default.nix | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 9a6db72ae05..6819ffba21c 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,41 +1,27 @@ -{ thinkpad ? false -, stdenv -, fetchFromGitHub +{ stdenv , fetchurl , pkgconfig , meson , ninja -, libusb +, gusb , pixman , glib , nss -, gtk3 +, gobject-introspection , 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 = "1.0"; + pname = "libfprint"; + version = "1.90"; - 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}; + src = fetchurl { + url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/1bba17b5daa130aa548bc7ea96dc58c4/libfprint-1.90.0.tar.xz"; + sha256 = "930f530df369ff874d7971f0b7c7bdb7c81597e91af4668694b98fe30b4b3371"; + }; nativeBuildInputs = [ pkgconfig @@ -44,17 +30,15 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_43 + gobject-introspection ]; buildInputs = [ - libusb + gusb pixman glib nss - gtk3 - ] - ++ stdenv.lib.optional thinkpad openssl - ; + ]; mesonFlags = [ "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" |