diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2012-09-10 22:18:13 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2012-09-10 23:53:59 +0200 |
| commit | b2b67c055b048c0db9dea06a219b8ef87d5dbbfc (patch) | |
| tree | edfeca5cecf18bde63bc364da372512e3fd87f56 /pkgs/os-specific/linux/conky | |
| parent | 3692a2e83d9012b4f3493c15e93c1e5af0c3e8ea (diff) | |
| download | nixlib-b2b67c055b048c0db9dea06a219b8ef87d5dbbfc.tar nixlib-b2b67c055b048c0db9dea06a219b8ef87d5dbbfc.tar.gz nixlib-b2b67c055b048c0db9dea06a219b8ef87d5dbbfc.tar.bz2 nixlib-b2b67c055b048c0db9dea06a219b8ef87d5dbbfc.tar.lz nixlib-b2b67c055b048c0db9dea06a219b8ef87d5dbbfc.tar.xz nixlib-b2b67c055b048c0db9dea06a219b8ef87d5dbbfc.tar.zst nixlib-b2b67c055b048c0db9dea06a219b8ef87d5dbbfc.zip | |
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>
Diffstat (limited to 'pkgs/os-specific/linux/conky')
| -rw-r--r-- | pkgs/os-specific/linux/conky/curl-types-h.patch | 25 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/conky/default.nix | 2 |
2 files changed, 0 insertions, 27 deletions
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"; |