diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 30e807cde057b..b29c2781e3574 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -7,8 +7,8 @@ , libGLU, libGL , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk -, AGL, Carbon, Cocoa, Kernel, QTKit +, withWebKit ? !stdenv.isDarwin, webkitgtk # Disable webkitgtk on darwin pending #126101 +, AGL, AVFoundation, Carbon, Cocoa, Kernel, QTKit }: with lib; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk - ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; + ++ optionals stdenv.isDarwin [ setfile AVFoundation Carbon Cocoa Kernel QTKit ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; @@ -90,6 +90,5 @@ stdenv.mkDerivation rec { homepage = "https://www.wxwidgets.org/"; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; - badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index cab0197c9390e..2baa9dc7d51cd 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -23,6 +23,7 @@ , withWebKit ? false , webkitgtk ? null , AGL ? null +, AVFoundation ? null , Carbon ? null , Cocoa ? null , Kernel ? null @@ -59,8 +60,8 @@ stdenv.mkDerivation rec { ] ++ optionals withGtk2 [ gtk2 GConf ] ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU - ++ optional withWebKit webkitgtk - ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; + ++ optional (withWebKit && !stdenv.isDarwin) webkitgtk # Disable webkitgtk on darwin pending #126101 + ++ optionals stdenv.isDarwin [ setfile AVFoundation Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b62a052c988f1..6f5a15453f441 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20232,25 +20232,25 @@ with pkgs; wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + inherit (darwin.apple_sdk.frameworks) AGL AVFoundation Carbon Cocoa Kernel QTKit; }; wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = false; inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + inherit (darwin.apple_sdk.frameworks) AGL AVFoundation Carbon Cocoa Kernel QTKit; }; wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { withGtk2 = true; inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + inherit (darwin.apple_sdk.frameworks) AGL AVFoundation Carbon Cocoa Kernel QTKit; }; wxGTK31-gtk3 = callPackage ../development/libraries/wxwidgets/3.1 { withGtk2 = false; inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + inherit (darwin.apple_sdk.frameworks) AGL AVFoundation Carbon Cocoa Kernel QTKit; }; wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix {