Merge pull request #41098 from mkaito/oauth2_proxy

oauth2_proxy: Handle attributes being derivations
2018-06-18 20:47:55 +03:00 · 2018-06-18 20:47:55 +03:00 · 5e5bdfa6ad
commit 5e5bdfa6ad
parent e0e505de42 170223fe64
1 changed files with 1 additions and 0 deletions
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@ -72,6 +72,7 @@ let

  mapConfig = key: attr:
  if (!isNull attr && attr != []) then (
+    if isDerivation attr then mapConfig key (toString attr) else
    if (builtins.typeOf attr) == "set" then concatStringsSep " "
      (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else
    if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else