From 6630f7894f33f01ea34c9b1b172691ea8c531d4c Mon Sep 17 00:00:00 2001 From: Hoang Nguyen Date: Tue, 31 Dec 2024 18:06:36 +0700 Subject: [PATCH 1/3] chafa: enable support for avif, jxl and svg image formats --- pkgs/tools/misc/chafa/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 23954dc67596..57f41951e97f 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -7,12 +7,14 @@ libtool, pkg-config, which, + libavif, + libjxl, + librsvg, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, - imagemagick, Foundation, }: @@ -41,8 +43,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib - imagemagick - ] ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; + libavif + libjxl + librsvg + ]; patches = [ ./xmlcatalog_patch.patch ]; @@ -56,9 +60,6 @@ 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" ]; - meta = with lib; { description = "Terminal graphics for the 21st century"; homepage = "https://hpjansson.org/chafa/"; From 9c797da5f102896a02b254cea3655ad1a123650a Mon Sep 17 00:00:00 2001 From: Hoang Nguyen Date: Tue, 31 Dec 2024 18:09:51 +0700 Subject: [PATCH 2/3] chafa: install zsh completion --- pkgs/tools/misc/chafa/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 57f41951e97f..c00215903f8b 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + installShellFiles, autoconf, automake, libtool, @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { libxml2 docbook_xml_dtd_412 docbook_xsl + installShellFiles ]; buildInputs = [ @@ -60,6 +62,10 @@ stdenv.mkDerivation rec { "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" ]; + postInstall = '' + installShellCompletion --cmd chafa tools/completions/zsh-completion.zsh + ''; + meta = with lib; { description = "Terminal graphics for the 21st century"; homepage = "https://hpjansson.org/chafa/"; From d4cfe92add422e0e49099c32b1d0a5365790f5a7 Mon Sep 17 00:00:00 2001 From: Hoang Nguyen Date: Tue, 31 Dec 2024 18:10:28 +0700 Subject: [PATCH 3/3] chafa: split into multiple outputs --- pkgs/tools/misc/chafa/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index c00215903f8b..490d1a7049d9 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -30,6 +30,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-9RkN0yZnHf5cx6tsp3P6jsi0/xtplWxMm3hYCPjWj0M="; }; + outputs = [ + "bin" + "dev" + "man" + "out" + ]; + nativeBuildInputs = [ autoconf automake