2 files changed, 23 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix b/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix
index e19ed72222f7..2abf3823269b 100644
--- a/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix
@@ -1,7 +1,10 @@
-{ lib
+{ stdenv
+, lib
 , fetchFromGitHub
 , rustPlatform
 , installShellFiles
+, pkg-config
+, libwebp
 }:
 
 rustPlatform.buildRustPackage {
@@ -18,7 +21,8 @@ rustPlatform.buildRustPackage {
   buildAndTestSubdir = "catwalk";
   cargoHash = "sha256-KoxivYLzJEjWbxIkizrMpmVwUF7bfVxl13H774lzQRg=";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [ installShellFiles pkg-config ];
+  buildInputs = [ libwebp ];
 
   postInstall = ''
     installShellCompletion --cmd catwalk \
@@ -27,6 +31,14 @@ rustPlatform.buildRustPackage {
       --fish <("$out/bin/catwalk" completion fish)
   '';
 
+  doInstallCheck = !stdenv.hostPlatform.isStatic &&
+    stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.elf;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    readelf -a $out/bin/catwalk | grep -F 'Shared library: [libwebp.so'
+    runHook postInstallCheck
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/catppuccin/toolbox/tree/main/catwalk";
     description = "A CLI for Catppuccin that takes in four showcase images and displays them all at once";
diff --git a/nixpkgs/pkgs/development/tools/misc/ztags/default.nix b/nixpkgs/pkgs/development/tools/misc/ztags/default.nix
index 5106ad68fcaa..25010cc0cc67 100644
--- a/nixpkgs/pkgs/development/tools/misc/ztags/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/ztags/default.nix
@@ -1,24 +1,30 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, scdoc
 , zig_0_11
 }:
 
 stdenv.mkDerivation {
   pname = "ztags";
-  version = "unstable-2023-08-29";
+  version = "unstable-2023-09-07";
 
   src = fetchFromGitHub {
     owner = "gpanders";
     repo = "ztags";
-    rev = "87dbc4ba7993fa1537ddce942c6ce4cf90ce0809";
-    hash = "sha256-FZZZnTmz4mxhiRXs16A41fz0WYIg6oGM7xj2cECRkrM=";
+    rev = "6cdbd6dcdeda0d1ab9ad30261000e3d21b2407e6";
+    hash = "sha256-lff5L7MG8RJdJM/YebJKDkKfkG4oumC0HytiCUOUG5Q=";
   };
 
   nativeBuildInputs = [
+    scdoc
     zig_0_11.hook
   ];
 
+  postInstall = ''
+    zig build docs --prefix $out
+  '';
+
   meta = with lib; {
     description = "Generate tags files for Zig projects";
     homepage = "https://github.com/gpanders/ztags";