diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-26 18:01:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-26 18:01:52 -0500 |
commit | a7ffeaae61806dbff5f54633b9cc810dbf2ef923 (patch) | |
tree | 336176ff82fc303d07296784d816c8e6d89dc73c | |
parent | 1552bc6786783beb36de2635f6bab307f57c60c5 (diff) | |
parent | ea77cad56976f554bde3ef7d718de78a63eb7b50 (diff) | |
download | nixlib-a7ffeaae61806dbff5f54633b9cc810dbf2ef923.tar nixlib-a7ffeaae61806dbff5f54633b9cc810dbf2ef923.tar.gz nixlib-a7ffeaae61806dbff5f54633b9cc810dbf2ef923.tar.bz2 nixlib-a7ffeaae61806dbff5f54633b9cc810dbf2ef923.tar.lz nixlib-a7ffeaae61806dbff5f54633b9cc810dbf2ef923.tar.xz nixlib-a7ffeaae61806dbff5f54633b9cc810dbf2ef923.tar.zst nixlib-a7ffeaae61806dbff5f54633b9cc810dbf2ef923.zip |
Merge pull request #78480 from gnidorah/libfprint
libfprint: 1.90 -> 1.0
-rw-r--r-- | pkgs/development/libraries/libfprint/default.nix | 40 | ||||
-rw-r--r-- | pkgs/tools/security/fprintd/default.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 43 insertions, 19 deletions
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 6819ffba21c3..9a6db72ae058 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/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" diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 13e6c0be391a..41a00306f695 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,9 +1,11 @@ -{ stdenv +{ thinkpad ? false +, stdenv , fetchurl , fetchpatch , pkgconfig , intltool -, libfprint +, libfprint-thinkpad ? null +, libfprint ? null , glib , dbus-glib , polkit @@ -15,7 +17,7 @@ }: stdenv.mkDerivation rec { - pname = "fprintd"; + pname = "fprintd" + stdenv.lib.optionalString thinkpad "-thinkpad"; version = "0.9.0"; src = fetchurl { @@ -44,8 +46,10 @@ stdenv.mkDerivation rec { nss pam systemd - libfprint - ]; + ] + ++ stdenv.lib.optional thinkpad libfprint-thinkpad + ++ stdenv.lib.optional (!thinkpad) libfprint + ; configureFlags = [ # is hardcoded to /var/lib/fprint, this is for the StateDirectory install target diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3831db8d4017..2e94b0167b8d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -126,7 +126,6 @@ mapAliases ({ ''; font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12 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 fuseki = apache-jena-fuseki; # added 2018-04-25 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15 @@ -213,7 +212,6 @@ mapAliases ({ liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12 liberation_ttf_v2_from_source = liberation_ttf_v2; # 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_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a90a1a39a234..fa84cd785fb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3398,6 +3398,9 @@ in fprot = callPackage ../tools/security/fprot { }; fprintd = callPackage ../tools/security/fprintd { }; + fprintd-thinkpad = fprintd.override { + thinkpad = true; + }; franz = callPackage ../applications/networking/instant-messengers/franz { }; @@ -12480,6 +12483,9 @@ in }; libfprint = callPackage ../development/libraries/libfprint { }; + libfprint-thinkpad = libfprint.override { + thinkpad = true; + }; libfpx = callPackage ../development/libraries/libfpx { }; |