diff options
author | Elmo Todurov <elmo.todurov@eesti.ee> | 2019-05-15 21:52:42 +0300 |
---|---|---|
committer | Elmo Todurov <elmo.todurov@eesti.ee> | 2019-05-20 20:48:30 +0300 |
commit | 394b43f1fd8a937798c99a9eb4a380f479c39d5b (patch) | |
tree | 90eac50ff340d0b8d3749962b1c973b6b073a639 /pkgs/development/libraries/libfprint/default.nix | |
parent | c912002f2c16f2247e143373d9f98eb35bf06b97 (diff) | |
download | nixpkgs-394b43f1fd8a937798c99a9eb4a380f479c39d5b.tar nixpkgs-394b43f1fd8a937798c99a9eb4a380f479c39d5b.tar.gz nixpkgs-394b43f1fd8a937798c99a9eb4a380f479c39d5b.tar.bz2 nixpkgs-394b43f1fd8a937798c99a9eb4a380f479c39d5b.tar.lz nixpkgs-394b43f1fd8a937798c99a9eb4a380f479c39d5b.tar.xz nixpkgs-394b43f1fd8a937798c99a9eb4a380f479c39d5b.tar.zst nixpkgs-394b43f1fd8a937798c99a9eb4a380f479c39d5b.zip |
libfprint: added option to use fork for Lenovo ThinkPad
Diffstat (limited to 'pkgs/development/libraries/libfprint/default.nix')
-rw-r--r-- | pkgs/development/libraries/libfprint/default.nix | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 3f3062e3c08..410496a7bb7 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,16 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3 -, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ 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 { - name = "libfprint-${version}"; + pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad"; version = "0.99.0"; - src = fetchurl { - url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz"; - sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187"; - }; + src = { + libfprint-thinkpad = + fetchFromGitHub { + owner = "3v1n0"; + repo = "libfprint"; + rev = "2e2e3821717e9042e93a995bdbd3d00f2df0be9c"; + sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b"; + }; + libfprint = fetchurl { + url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz"; + sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187"; + }; + }.${pname}; + + buildInputs = [ libusb pixman glib nss gtk3 ] + ++ stdenv.lib.optional thinkpad openssl; - buildInputs = [ libusb pixman glib nss gtk3 ]; nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ]; mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ]; |