From b2b67c055b048c0db9dea06a219b8ef87d5dbbfc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 10 Sep 2012 22:18:13 +0200
Subject: 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>
---
 pkgs/os-specific/linux/conky/curl-types-h.patch | 25 -------------------------
 pkgs/os-specific/linux/conky/default.nix        |  2 --
 2 files changed, 27 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/conky/curl-types-h.patch

diff --git a/pkgs/os-specific/linux/conky/curl-types-h.patch b/pkgs/os-specific/linux/conky/curl-types-h.patch
deleted file mode 100644
index ba99da23b46c..000000000000
--- a/pkgs/os-specific/linux/conky/curl-types-h.patch
+++ /dev/null
@@ -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>
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 2ef52aee99ee..94c7e72f0e2e 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -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";
-- 
cgit 1.4.1