summaryrefslogtreecommitdiffstats
path: root/pkgs/development/libraries/wxwidgets/3.0
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-10-24 10:58:16 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2017-10-24 13:20:38 +0200
commitaebae6c20850ea1c29d2dad9d29b4db6c09e317c (patch)
treed675e1af2641f4bff195a09606b90532471f8302 /pkgs/development/libraries/wxwidgets/3.0
parentf269f319856f41ae562bf91a44e612d22f1e5f88 (diff)
webkitgtk: 2.16.6 -> 2.18.1 for multiple CVEs
See https://webkitgtk.org/security/WSA-2017-0008.html
Diffstat (limited to 'pkgs/development/libraries/wxwidgets/3.0')
-rw-r--r--pkgs/development/libraries/wxwidgets/3.0/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 35300ed9419a..2375de4b1bfa 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -3,13 +3,13 @@
, withMesa ? true, mesa_glu ? null, mesa_noglu ? null
, compat24 ? false, compat26 ? true, unicode ? true
, withGtk2 ? true
-, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null
+, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
}:
assert withMesa -> mesa_glu != null && mesa_noglu != null;
-assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null;
+assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null;
with stdenv.lib;
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
[ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
gst-plugins-base GConf ]
++ optional withMesa mesa_glu
- ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x)
+ ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x)
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
nativeBuildInputs = [ pkgconfig ];