nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 02:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Validated as no change in `out` output with `diffoscope`.
This commit is contained in:
Sergei Trofimovich 2022-10-09 10:04:52 +01:00
parent 473e97e434
commit c0f308b787
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/conky/default.nix
View File

@ -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
@ -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;
@ -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