diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
| commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
| tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/development/libraries/libfprint | |
| parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
| parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
| download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip | |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libfprint')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libfprint/default.nix | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/nixpkgs/pkgs/development/libraries/libfprint/default.nix index 6819ffba21c3..9a6db72ae058 100644 --- a/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/nixpkgs/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" |