diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix
index 23954dc67596..490d1a7049d9 100644
--- a/pkgs/tools/misc/chafa/default.nix
+++ b/pkgs/tools/misc/chafa/default.nix
@@ -2,17 +2,20 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  installShellFiles,
   autoconf,
   automake,
   libtool,
   pkg-config,
   which,
+  libavif,
+  libjxl,
+  librsvg,
   libxslt,
   libxml2,
   docbook_xml_dtd_412,
   docbook_xsl,
   glib,
-  imagemagick,
   Foundation,
 }:
 
@@ -27,6 +30,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-9RkN0yZnHf5cx6tsp3P6jsi0/xtplWxMm3hYCPjWj0M=";
   };
 
+  outputs = [
+    "bin"
+    "dev"
+    "man"
+    "out"
+  ];
+
   nativeBuildInputs = [
     autoconf
     automake
@@ -37,12 +47,15 @@ stdenv.mkDerivation rec {
     libxml2
     docbook_xml_dtd_412
     docbook_xsl
+    installShellFiles
   ];
 
   buildInputs = [
     glib
-    imagemagick
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin Foundation;
+    libavif
+    libjxl
+    librsvg
+  ];
 
   patches = [ ./xmlcatalog_patch.patch ];
 
@@ -56,8 +69,9 @@ stdenv.mkDerivation rec {
     "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"
   ];
 
-  # https://github.com/NixOS/nixpkgs/pull/240893#issuecomment-1635347507
-  NIX_LDFLAGS = [ "-lwebp" ];
+  postInstall = ''
+    installShellCompletion --cmd chafa tools/completions/zsh-completion.zsh
+  '';
 
   meta = with lib; {
     description = "Terminal graphics for the 21st century";