pyrox.dev
conky: use xorg.* packages directly instead of xlibsWrapper indirection
Validated as no change in `out` output with `diffoscope`.
+2
-3
pkgs/os-specific/linux/conky/default.nix
+2
-3
pkgs/os-specific/linux/conky/default.nix
···
15
15
, docbook_xsl ? null , docbook_xml_dtd_44 ? null
16
16
17
17
, ncursesSupport ? true , ncurses ? null
18
-
, x11Support ? true , xlibsWrapper ? null
18
+
, x11Support ? true , freetype, xorg
19
19
, xdamageSupport ? x11Support, libXdamage ? null
20
20
, doubleBufferSupport ? x11Support
21
21
, imlib2Support ? x11Support, imlib2 ? null
···
43
43
44
44
assert ncursesSupport -> ncurses != null;
45
45
46
-
assert x11Support -> xlibsWrapper != null;
47
46
assert xdamageSupport -> x11Support && libXdamage != null;
48
47
assert imlib2Support -> x11Support && imlib2 != null;
49
48
assert luaSupport -> lua != null;
···
95
94
buildInputs = [ glib libXinerama ]
96
95
++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ]
97
96
++ optional ncursesSupport ncurses
98
-
++ optional x11Support xlibsWrapper
97
+
++ optionals x11Support [ freetype xorg.libICE xorg.libX11 xorg.libXext xorg.libXft xorg.libSM ]
99
98
++ optional xdamageSupport libXdamage
100
99
++ optional imlib2Support imlib2
101
100
++ optional luaSupport lua