From 58c0d63100244211f5a898d5c26a76aca038698c Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 25 Aug 2017 18:27:41 +0200 Subject: [PATCH] twister: Fix build against GCC 6.x This applies upstream commit miguelfreitas/twister-core@dd4f5a176958ea6. Tested only by building and executing "twisterd --help", but no serious testing done otherwise. Signed-off-by: aszlig --- pkgs/applications/networking/p2p/twister/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 2388b9ded18..e5a242662ce 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python2 +{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, python2 , boost, db, openssl, geoip, libiconv, miniupnpc , srcOnly, fetchgit }: @@ -37,6 +37,12 @@ in stdenv.mkDerivation rec { boost db openssl geoip miniupnpc libiconv ]; + patches = stdenv.lib.singleton (fetchpatch { + url = "https://github.com/miguelfreitas/twister-core/commit/" + + "dd4f5a176958ea6ed855dc3fcef79680c1c0c92c.patch"; + sha256 = "06fgmqnjyl83civ3ixiq673k8zjgm8n2w4w46nsh810nprqim8s6"; + }); + postPatch = '' sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \ src/init.cpp