JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tengine: fix build with gcc7

Browse Source
This commit is contained in:
Uli Baum 2018-08-07 22:02:39 +02:00
parent 5fce5fadf5
commit 5a25e17628
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/http/tengine/default.nix
View File

@ -60,7 +60,10 @@ stdenv.mkDerivation rec {
++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
++ map (mod: "--add-module=${mod.src}") modules; ++ 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); preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);

3
pkgs/top-level/all-packages.nix
View File

@ -19955,8 +19955,7 @@ with pkgs;
teeworlds = callPackage ../games/teeworlds { }; teeworlds = callPackage ../games/teeworlds { };
tengine = callPackage ../servers/http/tengine { tengine = callPackage ../servers/http/tengine {
stdenv = overrideCC stdenv gcc6; modules = with nginxModules; [ rtmp dav moreheaders modsecurity-nginx ];
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.modsecurity-nginx];
}; };
tennix = callPackage ../games/tennix { }; tennix = callPackage ../games/tennix { };