diff options
| author | Volth <volth@webmaster.ms> | 2017-05-26 13:43:25 +0000 |
|---|---|---|
| committer | Volth <volth@webmaster.ms> | 2017-05-26 13:43:25 +0000 |
| commit | b7ccf27229d9479e5cea2f2d2c2b06477d9e3049 (patch) | |
| tree | 692f21c6fd2adc50e6a08c41c01749b3280342d0 /pkgs/development/libraries/wxwidgets | |
| parent | 690a83091bd0e10ce7c70b081c861a6ff2a6d532 (diff) | |
| download | nixpkgs-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar nixpkgs-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar.gz nixpkgs-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar.bz2 nixpkgs-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar.lz nixpkgs-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar.xz nixpkgs-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.tar.zst nixpkgs-b7ccf27229d9479e5cea2f2d2c2b06477d9e3049.zip | |
rename webkitgtk24x -> webkitgtk24x-gtk3; webkitgtk2 -> webkitgtk24x-gtk2
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 5b1e0fc067c..ef32575c8e3 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -2,13 +2,13 @@ , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true -, withWebKit ? false, webkitgtk2 ? null +, withWebKit ? false, webkitgtk24x-gtk2 ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> mesa_glu != null && mesa_noglu != null; -assert withWebKit -> webkitgtk2 != null; +assert withWebKit -> webkitgtk24x-gtk2 != null; with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation { [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] ++ optional withMesa mesa_glu - ++ optional withWebKit webkitgtk2 + ++ optional withWebKit webkitgtk24x-gtk2 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; |