Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

conky: use xorg.* packages directly instead of xlibsWrapper indirection #195200

Merged
merged 1 commit into from
Oct 16, 2022
Merged

conky: use xorg.* packages directly instead of xlibsWrapper indirection #195200

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pkgs/os-specific/linux/conky/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
, docbook_xsl ? null , docbook_xml_dtd_44 ? null

, ncursesSupport ? true , ncurses ? null
, x11Support ? true , xlibsWrapper ? null
, x11Support ? true , freetype, xorg
, xdamageSupport ? x11Support, libXdamage ? null
, doubleBufferSupport ? x11Support
, imlib2Support ? x11Support, imlib2 ? null
Expand Down Expand Up @@ -43,7 +43,6 @@ assert docsSupport -> docbook2x != null && libxslt != null

assert ncursesSupport -> ncurses != null;

assert x11Support -> xlibsWrapper != null;
assert xdamageSupport -> x11Support && libXdamage != null;
assert imlib2Support -> x11Support && imlib2 != null;
assert luaSupport -> lua != null;
Expand Down Expand Up @@ -95,7 +94,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib libXinerama ]
++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ]
++ optional ncursesSupport ncurses
++ optional x11Support xlibsWrapper
++ optionals x11Support [ freetype xorg.libICE xorg.libX11 xorg.libXext xorg.libXft xorg.libSM ]
++ optional xdamageSupport libXdamage
++ optional imlib2Support imlib2
++ optional luaSupport lua
Expand Down