JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libfprint: added option to use fork for Lenovo ThinkPad

Browse Source
This commit is contained in:
Elmo Todurov 2019-05-15 21:52:42 +03:00
parent c912002f2c
commit 394b43f1fd
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/libfprint/default.nix
View File

@ -1,16 +1,29 @@
{ stdenv, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3 { thinkpad ? false, stdenv, fetchFromGitHub, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3
, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: , coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43, openssl ? null }:
assert thinkpad -> openssl != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libfprint-${version}"; pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad";
version = "0.99.0"; version = "0.99.0";
src = fetchurl { 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"; url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz";
sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187"; 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 ]; nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ];
mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ]; mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ];

3
pkgs/top-level/all-packages.nix
View File

@ -11299,6 +11299,9 @@ in
}; };
libfprint = callPackage ../development/libraries/libfprint { }; libfprint = callPackage ../development/libraries/libfprint { };
libfprint-thinkpad = libfprint.override {
thinkpad = true;
};
libfpx = callPackage ../development/libraries/libfpx { }; libfpx = callPackage ../development/libraries/libfpx { };