diff options
author | volth <volth@webmaster.ms> | 2017-07-01 00:20:20 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-01 00:20:20 +0000 |
commit | a720bd45e693e610911b4a35bae45e534798671d (patch) | |
tree | 3a7450c198df91289dcb6e3c4173b52e38f68c34 /pkgs/development/libraries/wxwidgets | |
parent | bb8759f9286856292e52f02735f45994f6be90bf (diff) | |
parent | e02064093218e71da56f73392250cfa85e2babd1 (diff) | |
download | nixlib-a720bd45e693e610911b4a35bae45e534798671d.tar nixlib-a720bd45e693e610911b4a35bae45e534798671d.tar.gz nixlib-a720bd45e693e610911b4a35bae45e534798671d.tar.bz2 nixlib-a720bd45e693e610911b4a35bae45e534798671d.tar.lz nixlib-a720bd45e693e610911b4a35bae45e534798671d.tar.xz nixlib-a720bd45e693e610911b4a35bae45e534798671d.tar.zst nixlib-a720bd45e693e610911b4a35bae45e534798671d.zip |
Merge branch 'master' into wxwidgets-3.0.3.1
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
-rw-r--r-- | pkgs/development/libraries/wxwidgets/3.0/default.nix | 6 |
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 0de8d2701825..f7fcf8a2206c 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, webkitgtk2 ? null, webkitgtk216x ? null +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> mesa_glu != null && mesa_noglu != null; -assert withWebKit -> (if withGtk2 then webkitgtk2 else webkitgtk216x) != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != 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 webkitgtk2 else webkitgtk216x) + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; |