mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-20 11:05:14 +00:00
conky: Remove curl/types.h patch.
This patch is no longer needed, as it is fixed upstream now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
3692a2e83d
commit
b2b67c055b
@ -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>
|
@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
|
||||
(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/;
|
||||
description = "Conky is an advanced, highly configurable system monitor complied without X based on torsmo";
|
||||
|
Loading…
Reference in New Issue
Block a user