diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index 5c45b29ec5cd6eb..7a292c468dbc51a 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto -, gstreamer, gst_plugins_base, GConf, setfile +{ stdenv, fetchurl, pkgconfig, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +, gstreamer, gst_plugins_base, libnotify, setfile +, withGtk3 ? false, gtk2 ? null, gtk3 ? null , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true , withWebKit ? false, webkitgtk2 ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null @@ -13,9 +14,10 @@ with stdenv.lib; let version = "3.0.2"; -in -stdenv.mkDerivation { - name = "wxwidgets-${version}"; + gtk = (if withGtk3 then gtk3 else gtk2); + +in stdenv.mkDerivation { + name = "wxwidgets-${version}-gtk${if withGtk3 then "3" else "2"}"; src = fetchurl { url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; @@ -23,10 +25,11 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer - gst_plugins_base GConf ] + [ libnotify libXinerama libSM libXxf86vm xf86vidmodeproto + gstreamer gst_plugins_base ] + ++ [ gtk ] ++ optional withMesa mesa - ++ optional withWebKit webkitgtk2 + ++ optional (withWebKit && !withGtk3) webkitgtk2 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; @@ -34,7 +37,8 @@ stdenv.mkDerivation { propagatedBuildInputs = optional stdenv.isDarwin AGL; configureFlags = - [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" + [ "--disable-precomp-headers" "--enable-mediactrl" + (if withGtk3 then "--enable-gtk3" else "--enable-gtk2") (if compat24 then "--enable-compat24" else "--disable-compat24") (if compat26 then "--enable-compat26" else "--disable-compat26") ] ++ optional unicode "--enable-unicode" @@ -65,13 +69,12 @@ stdenv.mkDerivation { "; passthru = { - inherit compat24 compat26 unicode; - gtk = gtk2; + inherit compat24 compat26 gtk unicode; }; enableParallelBuilding = true; - - meta = { - platforms = with stdenv.lib.platforms; darwin ++ linux; + + meta = with stdenv.lib; { + platforms = with platforms; darwin ++ linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28668e0fc1c253f..f4dd62d7ceec8c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9834,6 +9834,13 @@ with pkgs; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; + wxGTK30-gtk3 = callPackage ../development/libraries/wxGTK-3.0/default.nix { + withGtk3 = true; + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + withMesa = lib.elem system lib.platforms.mesaPlatforms; + }; + wxmac = callPackage ../development/libraries/wxmac { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez;