From be4c6fe4c82f3b2c91197003b68be889e04bde7d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 11 Feb 2021 05:04:56 +0100 Subject: [PATCH] libfprint: 1.90.5 -> 1.90.7 - https://gitlab.freedesktop.org/libfprint/libfprint/-/tags/v1.90.7 - https://gitlab.freedesktop.org/libfprint/libfprint/-/tags/v1.90.6 Also correct license, drop no longer needed cflags and avoid alias. --- pkgs/development/libraries/libfprint/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index f3f7313accbb..0bbfbad8aa10 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -10,13 +10,13 @@ , gobject-introspection , coreutils , gtk-doc -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_43 }: stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.5"; + version = "1.90.7"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "1wfwka2ik4hbb5wk5dp533040sqygwswg91c3v5fvpmmixh5qx9j"; + sha256 = "sha256-g/yczzCZEzUKV2uFl1MAPL1H/R2QJSwxgppI2ftt9QI="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meson ninja gtk-doc - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 gobject-introspection ]; @@ -44,8 +44,6 @@ stdenv.mkDerivation rec { nss ]; - NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; - mesonFlags = [ "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" ]; @@ -53,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://fprint.freedesktop.org/"; description = "A library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; };