3
0
Fork 0
forked from mirrors/nixpkgs

Merge branch 'conky-update'

This updates conky to version 1.9.0 and adds the weather plugins.

In addition, the patch removing curl/types.h from source files is removed as
well and instead replaced by a patch including stdbool.h, as some source files
don't compile well with C99 (instead, they should be compiled with a C++
compiler, as done in upstream's master).

We also now re-enable building with ncurses, which has been fixed in 1.9.0 as
well.
This commit is contained in:
aszlig 2012-09-11 00:00:13 +02:00
commit e99788541e
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
3 changed files with 23 additions and 34 deletions

View file

@ -1,25 +0,0 @@
curl removed <curl/types.h> 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 <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
/*
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 <libxml/xmlwriter.h>
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
#include <time.h>

View file

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

View file

@ -0,0 +1,12 @@
diff --git a/src/conky.c b/src/conky.c
index 5848b61..69a3d45 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -34,6 +34,7 @@
#include "common.h"
#include "timed_thread.h"
#include <stdarg.h>
+#include <stdbool.h>
#include <math.h>
#include <time.h>
#include <locale.h>