ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

wxGTK{30,31}: don't use webkitgtk24x

Browse Source 
You know cannot enable optional withWebKit when
withGtk2 is enabled.
This commit is contained in:
worldofpeace 2019-12-05 05:18:10 -05:00
parent 0c4d731797
commit 128b8d9181
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/wxwidgets/3.0/default.nix
View File

@ -6,15 +6,16 @@
, libGLU ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true
, withGtk2 ? true
, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null
, withWebKit ? false, webkitgtk ? null
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
}:
with stdenv.lib;
assert withMesa -> libGLU != null && libGL != null;
assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null;
assert withWebKit -> webkitgtk != null;
with stdenv.lib;
assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2.";
stdenv.mkDerivation rec {
version = "3.0.4";
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
[ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer
gst-plugins-base GConf ]
++ optional withMesa libGLU
++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk)
++ optional withWebKit webkitgtk
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
nativeBuildInputs = [ pkgconfig ];

9
pkgs/development/libraries/wxwidgets/3.1/default.nix
View File

@ -5,15 +5,16 @@
, withMesa ? libGLSupported, libGLU ? null, libGL ? null
, compat28 ? false, compat30 ? true, unicode ? true
, withGtk2 ? true
, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null
, withWebKit ? false, webkitgtk ? null
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
}:
with stdenv.lib;
assert withMesa -> libGLU != null && libGL != null;
assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null;
assert withWebKit -> webkitgtk != null;
with stdenv.lib;
assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK31: You cannot enable withWebKit when using withGtk2.";
stdenv.mkDerivation rec {
version = "3.1.2";
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
[ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer
gst-plugins-base GConf ]
++ optional withMesa libGLU
++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk)
++ optional withWebKit webkitgtk
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
nativeBuildInputs = [ pkgconfig ];