alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #28633 from orivej/webkitgtk24x

Browse source 
webkitgtk24x: fix build with gcc6
This commit is contained in:
Jörg Thalheim 2017-08-28 12:48:37 +01:00 committed by GitHub
parent fd3e1ce776 22a270b050
commit cfbdd3e0d6
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/webkitgtk/2.4.nix
View file

@ -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