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

treewide: replace daemon with enableDaemon

Browse Source 
broken with the introducation of "daemon" in

96ffba10f5
This commit is contained in:
Matthew Bauer 2019-09-22 20:14:05 -04:00
parent 067b4dbb93
commit ad22b9084d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -1,5 +1,5 @@
{ monolithic ? true # build monolithic Quassel { monolithic ? true # build monolithic Quassel
, daemon ? false # build Quassel daemon , enableDaemon ? false # build Quassel daemon
, client ? false # build Quassel client , client ? false # build Quassel client
, tag ? "-kf5" # tag added to the package name , tag ? "-kf5" # tag added to the package name
, static ? false # link statically , static ? false # link statically
@ -21,11 +21,11 @@
let let
buildClient = monolithic || client; buildClient = monolithic || client;
buildCore = monolithic || daemon; buildCore = monolithic || enableDaemon;
in in
assert monolithic -> !client && !daemon; assert monolithic -> !client && !enableDaemon;
assert client || daemon -> !monolithic; assert client || enableDaemon -> !monolithic;
assert !buildClient -> !withKDE; # KDE is used by the client only assert !buildClient -> !withKDE; # KDE is used by the client only
let let
@ -63,12 +63,12 @@ in with stdenv; mkDerivation rec {
] ]
++ edf static "STATIC" ++ edf static "STATIC"
++ edf monolithic "WANT_MONO" ++ edf monolithic "WANT_MONO"
++ edf daemon "WANT_CORE" ++ edf enableDaemon "WANT_CORE"
++ edf client "WANT_QTCLIENT" ++ edf client "WANT_QTCLIENT"
++ edf withKDE "WITH_KDE"; ++ edf withKDE "WITH_KDE";
preFixup = preFixup =
lib.optionalString daemon '' lib.optionalString enableDaemon ''
wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
'' + '' +
lib.optionalString buildClient '' lib.optionalString buildClient ''

4
pkgs/tools/networking/p2p/amule/default.nix
View File

@ -1,5 +1,5 @@
{ monolithic ? true # build monolithic amule { monolithic ? true # build monolithic amule
, daemon ? false # build amule daemon , enableDaemon ? false # build amule daemon
, httpServer ? false # build web interface for the daemon , httpServer ? false # build web interface for the daemon
, client ? false # build amule remote gui , client ? false # build amule remote gui
, fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null , fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
@ -32,7 +32,7 @@ mkDerivation rec {
"--disable-debug" "--disable-debug"
"--enable-optimize" "--enable-optimize"
(stdenv.lib.enableFeature monolithic "monolithic") (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 client "amule-gui")
(stdenv.lib.enableFeature httpServer "webserver") (stdenv.lib.enableFeature httpServer "webserver")
]; ];

4
pkgs/top-level/all-packages.nix
View File

@ -716,7 +716,7 @@ in
amuleDaemon = appendToName "daemon" (amule.override { amuleDaemon = appendToName "daemon" (amule.override {
monolithic = false; monolithic = false;
daemon = true; enableDaemon = true;
}); });
amuleGui = appendToName "gui" (amule.override { amuleGui = appendToName "gui" (amule.override {
@ -20192,7 +20192,7 @@ in
quasselDaemon = quassel.override { quasselDaemon = quassel.override {
monolithic = false; monolithic = false;
daemon = true; enableDaemon = true;
withKDE = false; withKDE = false;
tag = "-daemon-qt5"; tag = "-daemon-qt5";
}; };