From 2b7e88e9f5c867356df9976c288b40b36c74b3c5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:46:32 +0200 Subject: [PATCH] conky: Re-enable support for ncurses. Build breakage with enabled ncurses is fixed in 1.9.0 now, so we can safely re-enable it. Signed-off-by: aszlig --- pkgs/os-specific/linux/conky/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 381cc44e36f..a75df8b531c 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl}: +{ stdenv, fetchurl, pkgconfig, libxml2, curl, wirelesstools, glib, openssl +, ncurses }: stdenv.mkDerivation rec { name = "conky-1.9.0"; @@ -10,9 +11,9 @@ stdenv.mkDerivation rec { patches = [ ./stdbool.patch ]; - buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ]; + buildInputs = [ pkgconfig libxml2 curl wirelesstools glib openssl ncurses ]; configureFlags = - (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" "ncurses" ]) + (map (x: "--disable-${x}") [ "x11" "xdamage" "own-window" "xft" "lua" ]) ++ (map (x: "--enable-${x}") [ "mpd" "double-buffer" "wlan" "rss" ]); meta = {