diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2017-08-25 18:27:41 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2017-08-25 18:32:02 +0200 |
| commit | 58c0d63100244211f5a898d5c26a76aca038698c (patch) | |
| tree | e3b1f835cf767cc6b9d63a64e8681c34ae8752d4 /pkgs/applications/networking/p2p | |
| parent | c905b7895cff498a8ccddfa77ab401676d16ed55 (diff) | |
| download | nixlib-58c0d63100244211f5a898d5c26a76aca038698c.tar nixlib-58c0d63100244211f5a898d5c26a76aca038698c.tar.gz nixlib-58c0d63100244211f5a898d5c26a76aca038698c.tar.bz2 nixlib-58c0d63100244211f5a898d5c26a76aca038698c.tar.lz nixlib-58c0d63100244211f5a898d5c26a76aca038698c.tar.xz nixlib-58c0d63100244211f5a898d5c26a76aca038698c.tar.zst nixlib-58c0d63100244211f5a898d5c26a76aca038698c.zip | |
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/twister/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 2388b9ded18e..e5a242662ce1 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 |