Merge pull request #222080 from Stunkymonkey/nixos-optionalString

2023-04-20 16:07:30 +03:00
parent 2fc54db033 327b0cff7a
commit b83db86a9e
41 changed files with 89 additions and 95 deletions
--- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
@@ -242,7 +242,7 @@ in {
                jobdir="${jenkinsCfg.home}/$jenkinsjobname"
                rm -rf "$jobdir"
            done
-          '' + (if cfg.accessUser != "" then reloadScript else "");
+          '' + (optionalString (cfg.accessUser != "") reloadScript);
      serviceConfig = {
        Type = "oneshot";
        User = jenkinsCfg.user;