diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-24 08:15:01 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-24 08:15:01 +0200 |
commit | 192fb9d11b2d5f1ecc30eb0f5475dcff8ddf3978 (patch) | |
tree | 4f9fe2eae4371ba8ac59b9bc4f5f29ee3de34562 /pkgs/applications/networking/irc | |
parent | 86b7a5654e3c5d6f06d62742a2edf5b97cb98e06 (diff) | |
parent | eab41878ac16a80b1189d5e4aeec5e037f6571db (diff) |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/applications/networking/irc')
-rw-r--r-- | pkgs/applications/networking/irc/kvirc/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/irc/quassel/default.nix | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index bd38855109a19..6fd66096b5b2b 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub +{ lib, mkDerivation, fetchFromGitHub , qtbase, qtmultimedia, qtsvg, qtx11extras , pkgconfig, cmake, gettext }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kvirc"; version = "5.0.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pkgconfig cmake gettext ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced IRC Client"; homepage = "http://www.kvirc.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 6aacdde544bca..6addd66ac6342 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -1,5 +1,5 @@ { monolithic ? true # build monolithic Quassel -, daemon ? false # build Quassel daemon +, enableDaemon ? false # build Quassel daemon , client ? false # build Quassel client , tag ? "-kf5" # tag added to the package name , static ? false # link statically @@ -21,11 +21,11 @@ let buildClient = monolithic || client; - buildCore = monolithic || daemon; + buildCore = monolithic || enableDaemon; in -assert monolithic -> !client && !daemon; -assert client || daemon -> !monolithic; +assert monolithic -> !client && !enableDaemon; +assert client || enableDaemon -> !monolithic; assert !buildClient -> !withKDE; # KDE is used by the client only let @@ -63,12 +63,12 @@ in with stdenv; mkDerivation rec { ] ++ edf static "STATIC" ++ edf monolithic "WANT_MONO" - ++ edf daemon "WANT_CORE" + ++ edf enableDaemon "WANT_CORE" ++ edf client "WANT_QTCLIENT" ++ edf withKDE "WITH_KDE"; preFixup = - lib.optionalString daemon '' + lib.optionalString enableDaemon '' wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" '' + lib.optionalString buildClient '' |