From 5a25e176281064b8dce64a963d4f120ee717fe83 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 7 Aug 2018 22:02:39 +0200
Subject: [PATCH] tengine: fix build with gcc7
---
pkgs/servers/http/tengine/default.nix | 5 ++++-
pkgs/top-level/all-packages.nix | 3 +--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index b527b318e225..36f326d5590b 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -60,7 +60,10 @@ stdenv.mkDerivation rec {
++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
++ map (mod: "--add-module=${mod.src}") modules;
- NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
+ NIX_CFLAGS_COMPILE = [
+ "-I${libxml2.dev}/include/libxml2"
+ "-Wno-error=implicit-fallthrough"
+ ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35d6918e869c..46bf88b0dbf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19955,8 +19955,7 @@ with pkgs;
teeworlds = callPackage ../games/teeworlds { };
tengine = callPackage ../servers/http/tengine {
- stdenv = overrideCC stdenv gcc6;
- modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.modsecurity-nginx];
+ modules = with nginxModules; [ rtmp dav moreheaders modsecurity-nginx ];
};
tennix = callPackage ../games/tennix { };