From cb1339b8d32e086d1d969182bc9234ba7320e674 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 12 Apr 2026 12:40:47 +0200
Subject: [PATCH] shishi: resolve TODO

---
 pkgs/by-name/sh/shishi/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sh/shishi/package.nix b/pkgs/by-name/sh/shishi/package.nix
index bf07955faa96..8494d061d0d1 100644
--- a/pkgs/by-name/sh/shishi/package.nix
+++ b/pkgs/by-name/sh/shishi/package.nix
@@ -39,10 +39,15 @@ stdenv.mkDerivation (finalAttrs: {
     libgcrypt
     libgpg-error
     libtasn1
-    # TODO use lib.optional instead of setting packages to null
-    (if usePam then pam else null)
-    (if useLibidn then libidn else null)
-    (if useGnutls then gnutls else null)
+  ]
+  ++ lib.optionals usePam [
+    pam
+  ]
+  ++ lib.optionals useLibidn [
+    libidn
+  ]
+  ++ lib.optionals useGnutls [
+    gnutls
   ];
 
   configureFlags = [