public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conky: Remove curl/types.h patch.

Browse Source 
This patch is no longer needed, as it is fixed upstream now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2012-09-10 22:18:13 +02:00
parent 3692a2e83d
commit b2b67c055b
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/os-specific/linux/conky/curl-types-h.patch
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>

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

@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
(map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ])
++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]);
patches = [ ./curl-types-h.patch ];
meta = { meta = {
homepage = http://conky.sourceforge.net/; homepage = http://conky.sourceforge.net/;
description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo"; description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo";