From fb8d50d76a974fe726373433f434d3803d8d9075 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 5 Oct 2010 18:08:45 +0000
Subject: [PATCH] Make quassel compile with kde-4.5

kde45.kde is an attribute set, so rename flag to withKDE.

svn path=/nixpkgs/trunk/; revision=24096
---
 .../networking/irc/quassel/default.nix             | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index d94c00daed9b..2be964db3312 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -1,12 +1,10 @@
 { monolithic ? true # build monolithic Quassel
 , daemon ? false # build Quassel daemon
 , client ? false # build Quassel client
-, kde ? true # enable KDE integration
+, withKDE ? true # enable KDE integration
 , ssl ? true # enable SSL support
 , previews ? false # enable webpage previews on hovering over URLs
-, stdenv, fetchurl, cmake, qt4, kdelibs ? null, automoc4 ? null, phonon ? null }:
-
-assert kde -> kdelibs != null && automoc4 != null && phonon != null;
+, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }:
 
 let
   edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
@@ -21,9 +19,9 @@ in with stdenv; mkDerivation rec {
   };
 
   buildInputs = [ cmake qt4 ]
-    ++ lib.optional kde kdelibs
-    ++ lib.optional kde automoc4
-    ++ lib.optional kde phonon;
+    ++ lib.optional withKDE kdelibs
+    ++ lib.optional withKDE automoc4
+    ++ lib.optional withKDE phonon;
 
   cmakeFlags = [
     "-DWITH_DBUS=OFF"
@@ -34,7 +32,7 @@ in with stdenv; mkDerivation rec {
     ++ edf monolithic "WANT_MONO"
     ++ edf daemon "WANT_CORE"
     ++ edf client "WANT_QTCLIENT"
-    ++ edf kde "WITH_KDE"
+    ++ edf withKDE "WITH_KDE"
     ++ edf ssl "WITH_OPENSSL"
     ++ edf previews "WITH_WEBKIT"  ;