treewide: replace daemon with enableDaemon
broken with the introducation of "daemon" in
96ffba10f5
This commit is contained in:
parent
067b4dbb93
commit
ad22b9084d
@ -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 ''
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ monolithic ? true # build monolithic amule
|
||||
, daemon ? false # build amule daemon
|
||||
, enableDaemon ? false # build amule daemon
|
||||
, httpServer ? false # build web interface for the daemon
|
||||
, client ? false # build amule remote gui
|
||||
, fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
|
||||
@ -32,7 +32,7 @@ mkDerivation rec {
|
||||
"--disable-debug"
|
||||
"--enable-optimize"
|
||||
(stdenv.lib.enableFeature monolithic "monolithic")
|
||||
(stdenv.lib.enableFeature daemon "amule-daemon")
|
||||
(stdenv.lib.enableFeature enableDaemon "amule-daemon")
|
||||
(stdenv.lib.enableFeature client "amule-gui")
|
||||
(stdenv.lib.enableFeature httpServer "webserver")
|
||||
];
|
||||
|
@ -716,7 +716,7 @@ in
|
||||
|
||||
amuleDaemon = appendToName "daemon" (amule.override {
|
||||
monolithic = false;
|
||||
daemon = true;
|
||||
enableDaemon = true;
|
||||
});
|
||||
|
||||
amuleGui = appendToName "gui" (amule.override {
|
||||
@ -20192,7 +20192,7 @@ in
|
||||
|
||||
quasselDaemon = quassel.override {
|
||||
monolithic = false;
|
||||
daemon = true;
|
||||
enableDaemon = true;
|
||||
withKDE = false;
|
||||
tag = "-daemon-qt5";
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user