Allow the configuration file and theme directory to be specified at run time. Patch by Eelco Dolstra, from Nixpkgs. --- app.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app.cpp b/app.cpp index 237477d..735df9c 100644 --- a/app.cpp +++ b/app.cpp @@ -285,7 +285,9 @@ void App::Run() if ( cfg == 0 ) { cfg = new Cfg; - cfg->readConf(CFGFILE); + const char* cfgfile = getenv("SLIM_CFGFILE"); + if (!cfgfile) cfgfile = CFGFILE; + cfg->readConf(cfgfile); } string themebase = ""; string themefile = ""; @@ -297,7 +299,9 @@ void App::Run() } else { - themebase = string(THEMESDIR) + "/"; + const char* themesdir = getenv("SLIM_THEMESDIR"); + if (!themesdir) themesdir = THEMESDIR; + themebase = string(themesdir) + "/"; themeName = cfg->getOption("current_theme"); string::size_type pos; if ((pos = themeName.find(",")) != string::npos) -- 2.39.2 d> Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/nix/libutil/hash.cc
AgeCommit message (Expand)Author
2023-01-09daemon: Improve error message for wrong hash sizes....* nix/libutil/hash.cc (parseHash): Show the hash algorithm name and expected size in the error message. * tests/derivations.scm ("fixed-output derivation, invalid hash size"): New test. Ludovic Courtès
2022-12-18daemon: Make "opening file" error messages distinguishable....* nix/libstore/build.cc (DerivationGoal::openLogFile): Customize "opening file" error message. * nix/libutil/hash.cc (hashFile): Likewise. * nix/libutil/util.cc (readFile, writeFile): Likewise. Ludovic Courtès