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

quassel: remove qtwebkit input

This commit is contained in:
Thomas Tuegel 2016-05-10 20:07:55 -05:00
parent 4ffb000f19
commit f64eaa7b14
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/irc/quassel/qt-5.nix
View File

@ -1,12 +1,11 @@
{ 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
, previews ? false # enable webpage previews on hovering over URLs
, tag ? "" # tag added to the package name , tag ? "" # tag added to the package name
, static ? false # link statically , static ? false # link statically
, stdenv, fetchurl, cmake, makeWrapper, dconf , stdenv, fetchurl, cmake, makeWrapper, dconf
, qtbase, qtscript, qtwebkit , qtbase, qtscript
, phonon, libdbusmenu, qca-qt5 , phonon, libdbusmenu, qca-qt5
, withKDE ? stdenv.isLinux # enable KDE integration , withKDE ? stdenv.isLinux # enable KDE integration
@ -46,7 +45,6 @@ in with stdenv; mkDerivation rec {
[ cmake makeWrapper qtbase ] [ cmake makeWrapper qtbase ]
++ lib.optionals buildCore [qtscript qca-qt5] ++ lib.optionals buildCore [qtscript qca-qt5]
++ lib.optionals buildClient [libdbusmenu phonon] ++ lib.optionals buildClient [libdbusmenu phonon]
++ lib.optionals (buildClient && previews) [qtwebkit]
++ lib.optionals (buildClient && withKDE) [ ++ lib.optionals (buildClient && withKDE) [
extra-cmake-modules kconfigwidgets kcoreaddons extra-cmake-modules kconfigwidgets kcoreaddons
knotifications knotifyconfig ktextwidgets kwidgetsaddons knotifications knotifyconfig ktextwidgets kwidgetsaddons
@ -61,8 +59,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 withKDE "WITH_KDE" ++ edf withKDE "WITH_KDE";
++ edf previews "WITH_WEBKIT";
preFixup = preFixup =
lib.optionalString buildClient '' lib.optionalString buildClient ''