From 22a270b05037416848a187caeed9482476a0a8be Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 28 Aug 2017 10:05:48 +0000 Subject: [PATCH] webkitgtk24x: fix build with gcc6 --- pkgs/development/libraries/webkitgtk/2.4.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 40b27f67fff3..6669b562400f 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex +{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex , pkgconfig, which, gettext, gobjectIntrospection , gtk2, gtk3, wayland, libwebp, enchant, sqlite , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { ''; patches = [ ./webcore-svg-libxml-cflags.patch + (fetchpatch { + url = https://raw.githubusercontent.com/gentoo/gentoo/7c5457e265bd40c156a8fe6b2ff94a4e34bcea8e/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch; + sha256 = "0ll93dr5vxd40wvly1jaw41lvw86krac0jc6k6cacrps4i5ql5j0"; + }) ] ++ optionals stdenv.isDarwin [ ./configure.patch ./quartz-webcore.patch