diff options
author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:30:44 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:30:44 +0000 |
commit | 4f066da1de2f443bcc606b75f781d5da0d3ab987 (patch) | |
tree | 5e8208f53d26ae2751b104616e4188f1161dd391 | |
parent | 56ee5bca693b8e845ca9008edc12f06165d7af75 (diff) |
quassel: move defaults to package file
-rw-r--r-- | pkgs/applications/networking/irc/quassel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index ce6215908ae25..75645fdb33aa0 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -1,14 +1,14 @@ { monolithic ? true # build monolithic Quassel , daemon ? false # build Quassel daemon , client ? false # build Quassel client -, tag ? "" # tag added to the package name +, tag ? "-kf5" # tag added to the package name , static ? false # link statically , stdenv, fetchFromGitHub, cmake, makeWrapper, dconf , qtbase, qtscript , phonon, libdbusmenu, qca-qt5 -, withKDE ? stdenv.isLinux # enable KDE integration +, withKDE ? true # enable KDE integration , extra-cmake-modules , kconfigwidgets , kcoreaddons diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2cb636f91d6f..9b241008a7601 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18932,12 +18932,7 @@ in quantomatic = callPackage ../applications/science/physics/quantomatic { }; quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { - monolithic = true; - daemon = false; - client = false; - withKDE = true; - dconf = gnome3.dconf; - tag = "-kf5"; + inherit (gnome3) dconf; }; quasselClient = quassel.override { @@ -18949,8 +18944,8 @@ in quasselDaemon = quassel.override { monolithic = false; daemon = true; - tag = "-daemon-qt5"; withKDE = false; + tag = "-daemon-qt5"; }; quirc = callPackage ../tools/graphics/quirc {}; |