diff options
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/conky/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/os-specific/linux/conky/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/conky/default.nix b/nixpkgs/pkgs/os-specific/linux/conky/default.nix index 87f5bb052f48..a5fbc2817db0 100644 --- a/nixpkgs/pkgs/os-specific/linux/conky/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/conky/default.nix @@ -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; @@ -68,13 +67,13 @@ with lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.12.2"; + version = "1.13.1"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "sha256-x6bR5E5LIvKWiVM15IEoUgGas/hcRp3F/O4MTOhVPb8="; + sha256 = "sha256-3eCRzjfHGFiKuxmRHvnzqAg/+ApUKnHhsumWnio/Qxg="; }; postPatch = '' @@ -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 @@ -138,7 +137,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "http://conky.sourceforge.net/"; + homepage = "https://conky.sourceforge.net/"; description = "Advanced, highly configurable system monitor based on torsmo"; maintainers = [ maintainers.guibert ]; license = licenses.gpl3Plus; |