diff --git a/pkgs/by-name/ze/zellij/unwrapped.nix b/pkgs/by-name/ze/zellij-unwrapped/package.nix similarity index 96% rename from pkgs/by-name/ze/zellij/unwrapped.nix rename to pkgs/by-name/ze/zellij-unwrapped/package.nix index f691bc5418b2..c0331f24ac59 100644 --- a/pkgs/by-name/ze/zellij/unwrapped.nix +++ b/pkgs/by-name/ze/zellij-unwrapped/package.nix @@ -10,6 +10,7 @@ openssl, writableTmpDirAsHomeHook, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -76,6 +77,8 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh <($out/bin/zellij setup --generate-completion zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Terminal workspace with batteries included"; homepage = "https://zellij.dev/"; diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index 32013b52f0ae..38ba70d37b1e 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -1,23 +1,19 @@ { lib, - callPackage, + zellij-unwrapped, makeBinaryWrapper, stdenvNoCC, - nix-update-script, extraPackages ? [ ], }: -let - unwrapped = callPackage ./unwrapped.nix { }; -in stdenvNoCC.mkDerivation { - inherit (unwrapped) version meta; + inherit (zellij-unwrapped) version meta; pname = "zellij"; __structuredAttrs = true; strictDeps = true; - src = unwrapped; + src = zellij-unwrapped; dontUnpack = true; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -27,9 +23,4 @@ stdenvNoCC.mkDerivation { wrapProgram "$out/bin/zellij" \ --prefix PATH : '${lib.makeBinPath extraPackages}' ''; - - passthru = unwrapped.passthru or { } // { - inherit unwrapped; - updateScript = nix-update-script { attrPath = "zellij.unwrapped"; }; - }; }