diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-10-20 20:36:18 +0200 |
|---|---|---|
| committer | Silvan Mosberger <infinisil@icloud.com> | 2018-10-20 20:36:18 +0200 |
| commit | 039fc37f9c7eac5d7f648b7fa21227726cb39319 (patch) | |
| tree | 75db46a3c16f6edb18772e3e4267ed4ea4d351e6 /nixos | |
| parent | ef10c808479b33683422bc08dbdd4f46bfd2cd75 (diff) | |
| download | nixlib-039fc37f9c7eac5d7f648b7fa21227726cb39319.tar nixlib-039fc37f9c7eac5d7f648b7fa21227726cb39319.tar.gz nixlib-039fc37f9c7eac5d7f648b7fa21227726cb39319.tar.bz2 nixlib-039fc37f9c7eac5d7f648b7fa21227726cb39319.tar.lz nixlib-039fc37f9c7eac5d7f648b7fa21227726cb39319.tar.xz nixlib-039fc37f9c7eac5d7f648b7fa21227726cb39319.tar.zst nixlib-039fc37f9c7eac5d7f648b7fa21227726cb39319.zip | |
nixos/znc: Fix confOptions.extraZncConf being applied to wrong section
This bug was introduced in https://github.com/NixOS/nixpkgs/pull/41467
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/znc/options.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/znc/options.nix b/nixos/modules/services/networking/znc/options.nix index 505ebb3bf0ad..29d16e20318b 100644 --- a/nixos/modules/services/networking/znc/options.nix +++ b/nixos/modules/services/networking/znc/options.nix @@ -254,8 +254,9 @@ in listToAttrs (map (n: nameValuePair "#${n}" (mkDefault {})) net.channels); extraConfig = if net.extraConf == "" then mkDefault null else net.extraConf; }) c.networks; - extraConfig = [ c.passBlock ] ++ optional (c.extraZncConf != "") c.extraZncConf; + extraConfig = [ c.passBlock ]; }; + extraConfig = optional (c.extraZncConf != "") c.extraZncConf; }; }; |