nixos/nginx: fix error in writeNginxConfig

1 files changed, 10 insertions, 3 deletions

diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index 3454450c1f3a8..281d2b19bc65c 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -178,13 +178,20 @@ rec {
   writeJSBin = name:
     writeJS "/bin/${name}";
 
+  awkFormatNginx = builtins.toFile "awkFormat-nginx.awk" ''
+    awk -f
+    {sub(/^[ \t]+/,"");idx=0}
+    /\{/{ctx++;idx=1}
+    /\}/{ctx--}
+    {id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0}
+   '';
+
   writeNginxConfig = name: text: pkgs.runCommand name {
     inherit text;
     passAsFile = [ "text" ];
   } /* sh */ ''
-    cp "$textPath" $out
-    ${pkgs.nginx-config-formatter}/bin/nginxfmt $out
-    ${pkgs.gnused}/bin/sed -i '/^$/d' $out
+    # nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16
+    ${pkgs.gawk}/bin/awk -f ${awkFormatNginx} "$textPath" | ${pkgs.gnused}/bin/sed '/^\s*$/d' > $out
     ${pkgs.gixy}/bin/gixy $out
   '';