Merge pull request #74656 from Elyhaka/master

libfprint: 1.0 -> 1.90
This commit is contained in:
Jörg Thalheim 2019-12-01 15:54:46 +00:00 committed by GitHub
commit bfed0522b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 43 deletions

View file

@ -1,41 +1,27 @@
{ thinkpad ? false { stdenv
, stdenv
, fetchFromGitHub
, fetchurl , fetchurl
, pkgconfig , pkgconfig
, meson , meson
, ninja , ninja
, libusb , gusb
, pixman , pixman
, glib , glib
, nss , nss
, gtk3 , gobject-introspection
, coreutils , coreutils
, gtk-doc , gtk-doc
, docbook_xsl , docbook_xsl
, docbook_xml_dtd_43 , docbook_xml_dtd_43
, openssl ? null
}: }:
assert thinkpad -> openssl != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad"; pname = "libfprint";
version = "1.0"; version = "1.90";
src = { src = fetchurl {
libfprint-thinkpad = url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/1bba17b5daa130aa548bc7ea96dc58c4/libfprint-1.90.0.tar.xz";
fetchFromGitHub { sha256 = "930f530df369ff874d7971f0b7c7bdb7c81597e91af4668694b98fe30b4b3371";
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 = [ nativeBuildInputs = [
pkgconfig pkgconfig
@ -44,17 +30,15 @@ stdenv.mkDerivation rec {
gtk-doc gtk-doc
docbook_xsl docbook_xsl
docbook_xml_dtd_43 docbook_xml_dtd_43
gobject-introspection
]; ];
buildInputs = [ buildInputs = [
libusb gusb
pixman pixman
glib glib
nss nss
gtk3 ];
]
++ stdenv.lib.optional thinkpad openssl
;
mesonFlags = [ mesonFlags = [
"-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"

View file

@ -1,11 +1,9 @@
{ thinkpad ? false { stdenv
, stdenv
, fetchurl , fetchurl
, fetchpatch , fetchpatch
, pkgconfig , pkgconfig
, intltool , intltool
, libfprint-thinkpad ? null , libfprint
, libfprint ? null
, glib , glib
, dbus-glib , dbus-glib
, polkit , polkit
@ -17,7 +15,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad"; pname = "fprintd";
version = "0.9.0"; version = "0.9.0";
src = fetchurl { src = fetchurl {
@ -46,10 +44,8 @@ stdenv.mkDerivation rec {
nss nss
pam pam
systemd systemd
] libfprint
++ stdenv.lib.optional thinkpad libfprint-thinkpad ];
++ stdenv.lib.optional (!thinkpad) libfprint
;
configureFlags = [ configureFlags = [
# is hardcoded to /var/lib/fprint, this is for the StateDirectory install target # is hardcoded to /var/lib/fprint, this is for the StateDirectory install target

View file

@ -115,6 +115,7 @@ mapAliases ({
''; '';
font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12 font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12
foomatic_filters = foomatic-filters; # 2016-08 foomatic_filters = foomatic-filters; # 2016-08
fprintd-thinkpad = throw "removed from repository 2019-12-01: Install it manually with an override.";
fuse_exfat = exfat; # 2015-09-11 fuse_exfat = exfat; # 2015-09-11
fuseki = apache-jena-fuseki; # added 2018-04-25 fuseki = apache-jena-fuseki; # added 2018-04-25
fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15
@ -193,6 +194,7 @@ mapAliases ({
liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12 liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12
liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12 liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12
liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12 liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12
libfprint-thinkpad = throw "removed from repository 2019-12-01: Install it manually with an override.";
libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring = libgnome-keyring; # added 2018-02-25
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
libgumbo = gumbo; # added 2018-01-21 libgumbo = gumbo; # added 2018-01-21

View file

@ -3303,9 +3303,6 @@ in
fprot = callPackage ../tools/security/fprot { }; fprot = callPackage ../tools/security/fprot { };
fprintd = callPackage ../tools/security/fprintd { }; fprintd = callPackage ../tools/security/fprintd { };
fprintd-thinkpad = fprintd.override {
thinkpad = true;
};
franz = callPackage ../applications/networking/instant-messengers/franz { }; franz = callPackage ../applications/networking/instant-messengers/franz { };
@ -12222,9 +12219,6 @@ 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 { };