summary refs log tree commit diff
path: root/pkgs/development/libraries/wxwidgets
diff options
context:
space:
mode:
authorHerwig Hochleitner <herwig@bendlas.net>2018-03-15 01:23:26 +0100
committerHerwig Hochleitner <herwig@bendlas.net>2018-03-15 01:52:52 +0100
commit0b8d7fb16e1d79f070a3ac39f6b6a509bb7c1c9e (patch)
tree94c3b68c129d5fb07b3de36073d14838c62c84ba /pkgs/development/libraries/wxwidgets
parent86fbdfdd4c19549d1b299ff284ae53dde1c79f36 (diff)
downloadnixlib-0b8d7fb16e1d79f070a3ac39f6b6a509bb7c1c9e.tar
nixlib-0b8d7fb16e1d79f070a3ac39f6b6a509bb7c1c9e.tar.gz
nixlib-0b8d7fb16e1d79f070a3ac39f6b6a509bb7c1c9e.tar.bz2
nixlib-0b8d7fb16e1d79f070a3ac39f6b6a509bb7c1c9e.tar.lz
nixlib-0b8d7fb16e1d79f070a3ac39f6b6a509bb7c1c9e.tar.xz
nixlib-0b8d7fb16e1d79f070a3ac39f6b6a509bb7c1c9e.tar.zst
nixlib-0b8d7fb16e1d79f070a3ac39f6b6a509bb7c1c9e.zip
wxwidgets: depend on generic webkitgtk instead of 218x
Currently ahead of the upgrade to webkitgtk220x, this will make future
webkitgtk maintenance easier.

WebkitGTK, from 2.6 onwards has maintained API stability and will
continue to do so, as opposed to the jump from 2.4 to 2.6
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
-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 98621bb781e8..309d9be274d1 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -4,13 +4,13 @@
 , withMesa ? true, libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true
 , withGtk2 ? true
-, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null
+, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
 }:
 
 
 assert withMesa -> libGLU != null && libGL != null;
-assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null;
+assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null;
 
 with stdenv.lib;
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst-plugins-base GConf ]
     ++ optional withMesa libGLU
-    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x)
+    ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk)
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
   nativeBuildInputs = [ pkgconfig ];