summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2021-07-28 07:01:18 -0400
committerGitHub <noreply@github.com>2021-07-28 07:01:18 -0400
commitab93cc0adde7edd7e3c71435d9d4c935ca4b621f (patch)
tree8d42e82c6da6ae2ac2267729c044365aa5e4be0d /pkgs/development
parentbc3039dffce5b064958a10619a95ebca36d707e1 (diff)
parent0a002b6b6cd5d317ae51d943602e318afb3efd57 (diff)
downloadnixpkgs-ab93cc0adde7edd7e3c71435d9d4c935ca4b621f.tar
nixpkgs-ab93cc0adde7edd7e3c71435d9d4c935ca4b621f.tar.gz
nixpkgs-ab93cc0adde7edd7e3c71435d9d4c935ca4b621f.tar.bz2
nixpkgs-ab93cc0adde7edd7e3c71435d9d4c935ca4b621f.tar.lz
nixpkgs-ab93cc0adde7edd7e3c71435d9d4c935ca4b621f.tar.xz
nixpkgs-ab93cc0adde7edd7e3c71435d9d4c935ca4b621f.tar.zst
nixpkgs-ab93cc0adde7edd7e3c71435d9d4c935ca4b621f.zip
Merge pull request #131762 from grahamc/lib-fprint
{lib,}fprint: version bumps
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/libfprint/default.nix13
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index 979ba7eea53..42e308f41a9 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -10,6 +10,8 @@
 , nss
 , gobject-introspection
 , coreutils
+, cairo
+, libgudev
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_43
@@ -17,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libfprint";
-  version = "1.90.7";
+  version = "1.92.1";
   outputs = [ "out" "devdoc" ];
 
   src = fetchFromGitLab {
@@ -25,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "libfprint";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-g/yczzCZEzUKV2uFl1MAPL1H/R2QJSwxgppI2ftt9QI=";
+    sha256 = "0dpwzmwl9jjpaz44znvy3v8s9sln0c71b756rs1knk0zx8sa1qbc";
   };
 
   nativeBuildInputs = [
@@ -43,6 +45,8 @@ stdenv.mkDerivation rec {
     pixman
     glib
     nss
+    cairo
+    libgudev
   ];
 
   checkInputs = [
@@ -53,6 +57,7 @@ stdenv.mkDerivation rec {
     "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
     # Include virtual drivers for fprintd tests
     "-Ddrivers=all"
+    "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d"
   ];
 
   doCheck = true;
@@ -61,7 +66,9 @@ stdenv.mkDerivation rec {
     patchShebangs \
       tests/test-runner.sh \
       tests/unittest_inspector.py \
-      tests/virtual-image.py
+      tests/virtual-image.py \
+      tests/umockdev-test.py \
+      tests/test-generated-hwdb.sh
   '';
 
   meta = with lib; {