From d782d6e1dbe7df9e300307b8ef154305c1ea43c0 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 25 Jul 2026 12:18:47 +0200
Subject: [PATCH] zellij: avoid putting empty path segment into PATH when
 `extraPackages` is empty

---
 pkgs/by-name/ze/zellij/package.nix | 40 +++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix
index 38ba70d37b1e..feb18262db1b 100644
--- a/pkgs/by-name/ze/zellij/package.nix
+++ b/pkgs/by-name/ze/zellij/package.nix
@@ -3,24 +3,36 @@
   zellij-unwrapped,
   makeBinaryWrapper,
   stdenvNoCC,
+  symlinkJoin,
 
   extraPackages ? [ ],
 }:
-stdenvNoCC.mkDerivation {
-  inherit (zellij-unwrapped) version meta;
-  pname = "zellij";
+if extraPackages == [ ] then
+  symlinkJoin {
+    inherit (zellij-unwrapped) version meta;
+    pname = "zellij";
 
-  __structuredAttrs = true;
-  strictDeps = true;
+    __structuredAttrs = true;
+    strictDeps = true;
 
-  src = zellij-unwrapped;
-  dontUnpack = true;
+    paths = [ zellij-unwrapped ];
+  }
+else
+  stdenvNoCC.mkDerivation {
+    inherit (zellij-unwrapped) version meta;
+    pname = "zellij";
 
-  nativeBuildInputs = [ makeBinaryWrapper ];
-  buildPhase = ''
-    cp -rs --no-preserve=mode "$src" "$out"
+    __structuredAttrs = true;
+    strictDeps = true;
 
-    wrapProgram "$out/bin/zellij" \
-      --prefix PATH : '${lib.makeBinPath extraPackages}'
-  '';
-}
+    src = zellij-unwrapped;
+    dontUnpack = true;
+
+    nativeBuildInputs = [ makeBinaryWrapper ];
+    buildPhase = ''
+      cp -rs --no-preserve=mode "$src" "$out"
+
+      wrapProgram "$out/bin/zellij" \
+        --prefix PATH : '${lib.makeBinPath extraPackages}'
+    '';
+  }