diff --git a/pkgs/os-specific/linux/conky/curl-types-h.patch b/pkgs/os-specific/linux/conky/curl-types-h.patch new file mode 100644 index 000000000000..ba99da23b46c --- /dev/null +++ b/pkgs/os-specific/linux/conky/curl-types-h.patch @@ -0,0 +1,25 @@ +curl removed header +diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c +index 10e73a6..9bea299 100644 +--- a/src/ccurl_thread.c ++++ b/src/ccurl_thread.c +@@ -33,7 +33,6 @@ + #endif /* DEBUG */ + + #include +-#include + #include + + /* +diff --git a/src/eve.c b/src/eve.c +index dc07264..f62a5f6 100644 +--- a/src/eve.c ++++ b/src/eve.c +@@ -37,7 +37,6 @@ + #include + + #include +-#include + #include + + #include diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 29a81592c147..fda361d6c742 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,15 +1,19 @@ {stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}: -stdenv.mkDerivation { - name = "conky-1.7.2"; +stdenv.mkDerivation rec { + name = "conky-1.8.1"; src = fetchurl { - url = "mirror://sourceforge/conky/conky-1.7.2.tar.bz2"; - sha256 = "0p375id2saxm2bp6c33ddn9d6rxymmq60ajlvx49smwhzyqa3h5k"; + url = "mirror://sourceforge/conky/${name}.tar.bz2"; + sha256 = "0hsybra4qzaqzny6n66m7768vbwkikajcvcbsqgnnnb9527jfnpq"; }; buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; - configureFlags = "--disable-x11 --disable-xdamage --disable-own-window --disable-xft --disable-lua --enable-mpd --enable-double-buffer --enable-proc-uptime --enable-seti --enable-wlan --enable-rss"; + configureFlags = + (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) + ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); + + patches = [ ./curl-types-h.patch ]; meta = { homepage = http://conky.sourceforge.net/;