diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/libraries/libfprint/default.nix | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libfprint/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libfprint/default.nix | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/nixpkgs/pkgs/development/libraries/libfprint/default.nix index f3f7313accbb..979ba7eea539 100644 --- a/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -2,6 +2,7 @@ , fetchFromGitLab , pkg-config , meson +, python3 , ninja , gusb , pixman @@ -10,13 +11,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 +25,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "1wfwka2ik4hbb5wk5dp533040sqygwswg91c3v5fvpmmixh5qx9j"; + sha256 = "sha256-g/yczzCZEzUKV2uFl1MAPL1H/R2QJSwxgppI2ftt9QI="; }; nativeBuildInputs = [ @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { meson ninja gtk-doc - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_43 gobject-introspection ]; @@ -44,16 +45,29 @@ stdenv.mkDerivation rec { nss ]; - NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; + checkInputs = [ + python3 + ]; mesonFlags = [ "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d" + # Include virtual drivers for fprintd tests + "-Ddrivers=all" ]; + doCheck = true; + + postPatch = '' + patchShebangs \ + tests/test-runner.sh \ + tests/unittest_inspector.py \ + tests/virtual-image.py + ''; + 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 ]; }; |