diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-22 20:14:05 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-22 20:14:05 -0400 |
| commit | ad22b9084df5c8f436f1b7b17e80e21e24d8ab4b (patch) | |
| tree | 170473ec1c36d9917a88ef65e18e8fcd393c1b0a /pkgs/applications/networking | |
| parent | 067b4dbb931bec94976a7660353ce8617d558b29 (diff) | |
| download | nixpkgs-ad22b9084df5c8f436f1b7b17e80e21e24d8ab4b.tar nixpkgs-ad22b9084df5c8f436f1b7b17e80e21e24d8ab4b.tar.gz nixpkgs-ad22b9084df5c8f436f1b7b17e80e21e24d8ab4b.tar.bz2 nixpkgs-ad22b9084df5c8f436f1b7b17e80e21e24d8ab4b.tar.lz nixpkgs-ad22b9084df5c8f436f1b7b17e80e21e24d8ab4b.tar.xz nixpkgs-ad22b9084df5c8f436f1b7b17e80e21e24d8ab4b.tar.zst nixpkgs-ad22b9084df5c8f436f1b7b17e80e21e24d8ab4b.zip | |
treewide: replace daemon with enableDaemon
broken with the introducation of "daemon" in https://github.com/NixOS/nixpkgs/commit/96ffba10f5c959656314998f667f4999406b4144
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/irc/quassel/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 6aacdde544b..6addd66ac63 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 '' |