Skip to content

Commit 3430c76

Browse files
committed
nix: factor runtime deps into runtime-deps.nix
Extract the runtime dependency list from package.nix into a shared nix/runtime-deps.nix so shell.nix can include the same deps.
1 parent d7b6865 commit 3430c76

3 files changed

Lines changed: 32 additions & 22 deletions

File tree

nix/package.nix

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,15 @@
11
{
22
version ? "dirty",
33
extraPackages ? [ ],
4-
runtimeDeps ? [
5-
brightnessctl
6-
cliphist
7-
ddcutil
8-
wlsunset
9-
wl-clipboard
10-
wlr-randr
11-
imagemagick
12-
wget
13-
(python3.withPackages (pp: lib.optional calendarSupport pp.pygobject3))
14-
],
4+
runtimeDeps ? (callPackage ./runtime-deps.nix { inherit calendarSupport; }),
155

166
lib,
7+
callPackage,
178
stdenvNoCC,
189
# build
1910
qt6,
2011
quickshell,
21-
# runtime deps
22-
brightnessctl,
23-
cliphist,
24-
ddcutil,
25-
wlsunset,
26-
wl-clipboard,
27-
wlr-randr,
28-
imagemagick,
29-
wget,
30-
python3,
12+
# runtime
3113
wayland-scanner,
3214
# calendar support
3315
calendarSupport ? false,

nix/runtime-deps.nix

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
lib,
3+
brightnessctl,
4+
cliphist,
5+
ddcutil,
6+
wlsunset,
7+
wl-clipboard,
8+
wlr-randr,
9+
imagemagick,
10+
wget,
11+
python3,
12+
calendarSupport ? false,
13+
}:
14+
[
15+
brightnessctl
16+
cliphist
17+
ddcutil
18+
wlsunset
19+
wl-clipboard
20+
wlr-randr
21+
imagemagick
22+
wget
23+
(python3.withPackages (pp: lib.optional calendarSupport pp.pygobject3))
24+
]

nix/shell.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
quickshell,
3+
callPackage,
34
nixfmt,
45
statix,
56
deadnix,
@@ -10,6 +11,9 @@
1011
kdePackages,
1112
mkShellNoCC,
1213
}:
14+
let
15+
runtimeDeps = callPackage ./runtime-deps.nix { };
16+
in
1317
mkShellNoCC {
1418
#it's faster than mkDerivation / mkShell
1519
packages = [
@@ -30,5 +34,5 @@ mkShellNoCC {
3034
# CoC
3135
lefthook # githooks
3236
kdePackages.qtdeclarative # qmlfmt, qmllint, qmlls and etc; Qt6
33-
];
37+
] ++ runtimeDeps;
3438
}

0 commit comments

Comments
 (0)