mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-20 23:51:03 +00:00
zellij-unwrapped: split out from zellij wrapper
Expose the actual rust build as a top-level by-name package and have the wrapper take it as an argument, so overlays can patch or override it without needing to thread the new drv through the wrapper explicitly.
This commit is contained in:
@@ -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/";
|
||||
@@ -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"; };
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user