Refactor flake.nix, add Package suffix to cli package args

This commit is contained in:
2026-04-28 15:47:06 +03:00
parent 937655b8c1
commit 4aee7480c7
3 changed files with 24 additions and 26 deletions
+6 -8
View File
@@ -32,17 +32,15 @@
packages = forAllSystems (
system: let
pkgs = import nixpkgs {inherit system;};
t3code-desktop = pkgs.callPackage ./packages/t3code-desktop {
src = t3code;
codex = llm-agents.packages.${system}.codex;
claudeCode = llm-agents.packages.${system}."claude-code";
opencode = llm-agents.packages.${system}.opencode;
codexPackage = llm-agents.packages.${system}.codex;
claudeCodePackage = llm-agents.packages.${system}."claude-code";
opencodePackage = llm-agents.packages.${system}.opencode;
t3code-desktop = pkgs.callPackage ./packages/t3code-desktop {
inherit src codexPackage claudeCodePackage opencodePackage;
};
t3code-server = pkgs.callPackage ./packages/t3code-server {
src = t3code;
codex = llm-agents.packages.${system}.codex;
claudeCode = llm-agents.packages.${system}."claude-code";
opencode = llm-agents.packages.${system}.opencode;
inherit src codexPackage claudeCodePackage opencodePackage;
};
in {
inherit t3code-desktop t3code-server;
+9 -9
View File
@@ -5,8 +5,8 @@
stdenv,
symlinkJoin,
bun,
codex ? null,
claudeCode ? null,
codexPackage ? null,
claudeCodePackage ? null,
electron_40,
gcc,
git,
@@ -14,7 +14,7 @@
makeWrapper,
node-gyp,
nodejs,
opencode ? null,
opencodePackage ? null,
pkg-config,
python3,
writableTmpDirAsHomeHook,
@@ -198,14 +198,14 @@
});
withAgentPath = withCodex || withClaudeCode || withOpencode;
agentPath = lib.makeBinPath (
lib.optionals withCodex [codex]
++ lib.optionals withClaudeCode [claudeCode]
++ lib.optionals withOpencode [opencode]
lib.optionals withCodex [codexPackage]
++ lib.optionals withClaudeCode [claudeCodePackage]
++ lib.optionals withOpencode [opencodePackage]
);
in
assert lib.assertMsg (!withCodex || codex != null) "withCodex requires a codex package";
assert lib.assertMsg (!withClaudeCode || claudeCode != null) "withClaudeCode requires a claudeCode package";
assert lib.assertMsg (!withOpencode || opencode != null) "withOpencode requires an opencode package";
assert lib.assertMsg (!withCodex || codexPackage != null) "withCodex requires a codex package";
assert lib.assertMsg (!withClaudeCode || claudeCodePackage != null) "withClaudeCode requires a claudeCode package";
assert lib.assertMsg (!withOpencode || opencodePackage != null) "withOpencode requires an opencode package";
if withAgentPath
then
symlinkJoin {
+9 -9
View File
@@ -4,12 +4,12 @@
stdenv,
symlinkJoin,
bun,
codex ? null,
claudeCode ? null,
codexPackage ? null,
claudeCodePackage ? null,
makeBinaryWrapper,
node-gyp,
nodejs,
opencode ? null,
opencodePackage ? null,
python3,
writableTmpDirAsHomeHook,
withClaudeCode ? false,
@@ -129,14 +129,14 @@
});
withAgentPath = withCodex || withClaudeCode || withOpencode;
agentPath = lib.makeBinPath (
lib.optionals withCodex [codex]
++ lib.optionals withClaudeCode [claudeCode]
++ lib.optionals withOpencode [opencode]
lib.optionals withCodex [codexPackage]
++ lib.optionals withClaudeCode [claudeCodePackage]
++ lib.optionals withOpencode [opencodePackage]
);
in
assert lib.assertMsg (!withCodex || codex != null) "withCodex requires a codex package";
assert lib.assertMsg (!withClaudeCode || claudeCode != null) "withClaudeCode requires a claudeCode package";
assert lib.assertMsg (!withOpencode || opencode != null) "withOpencode requires an opencode package";
assert lib.assertMsg (!withCodex || codexPackage != null) "withCodex requires a codex package";
assert lib.assertMsg (!withClaudeCode || claudeCodePackage != null) "withClaudeCode requires a claudeCode package";
assert lib.assertMsg (!withOpencode || opencodePackage != null) "withOpencode requires an opencode package";
if withAgentPath
then
symlinkJoin {