public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make quassel compile with kde-4.5

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

svn path=/nixpkgs/trunk/; revision=24096
This commit is contained in:
Yury G. Kudryashov 2010-10-05 18:08:45 +00:00
parent d25e79afec
commit fb8d50d76a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/networking/irc/quassel/default.nix
View File

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