From 8c61b3af0398b1ec93d2abb2b80fa97099155b1c Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 26 Jul 2016 18:11:16 +0200
Subject: [PATCH] nginx: fixed duplicate http declaration

---
 nixos/modules/services/web-servers/nginx/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 1e5a8b9bc35..d6b9836498d 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -16,6 +16,8 @@ let
     error_log stderr;
     daemon off;
 
+    ${cfg.config}
+
     http {
       include ${cfg.package}/conf/mime.types;
       include ${cfg.package}/conf/fastcgi.conf;
@@ -86,18 +88,10 @@ let
           }
         }
       ''}
-    }
 
-    ${cfg.config}
-
-    # Keep this seperate to allow overriding previous settings
-    ${optionalString (cfg.httpConfig != "") ''
-    http {
-      include ${cfg.package}/conf/mime.types;
-      include ${cfg.package}/conf/fastcgi.conf;
       ${cfg.httpConfig}
     }
-    ''}
+
     ${cfg.appendConfig}
   '';