diff options
Diffstat (limited to 'pkgs/os-specific/linux/conky/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index fda361d6c742..086b792b4cd4 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,24 +1,26 @@ -{stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}: +{ stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl +, ncurses }: stdenv.mkDerivation rec { - name = "conky-1.8.1"; + name = "conky-1.9.0"; src = fetchurl { url = "mirror://sourceforge/conky/${name}.tar.bz2"; - sha256 = "0hsybra4qzaqzny6n66m7768vbwkikajcvcbsqgnnnb9527jfnpq"; + sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; }; - buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; - configureFlags = - (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) - ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); + patches = [ ./stdbool.patch ]; - patches = [ ./curl-types-h.patch ]; + buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ncurses ]; + configureFlags = + (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" ]) + ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" + "weather-metar" "weather-xoap" ]); meta = { homepage = http://conky.sourceforge.net/; description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo"; maintainers = [ stdenv.lib.maintainers.guibert ]; + license = stdenv.lib.licenses.gpl3Plus; }; } - |