From d304496834944199a1e33973007b144171eea493 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 15 Jun 2022 18:24:45 -0700 Subject: [PATCH] wxGTK30-gtk2,wxGTK30-gtk3: add missing buildInput on Darwin --- pkgs/development/libraries/wxwidgets/wxGTK30.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 6157786a5d04..82005a12dd2f 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -18,6 +18,7 @@ , withGtk2 ? true , withWebKit ? false, webkitgtk , AGL +, AVFoundation , Carbon , Cocoa , Kernel @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { ++ lib.optional withMesa libGLU ++ lib.optional withWebKit webkitgtk ++ lib.optionals stdenv.isDarwin [ + AVFoundation Carbon Cocoa Kernel @@ -130,7 +132,6 @@ stdenv.mkDerivation rec { license = licenses.wxWindows; maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; - badPlatforms = [ "x86_64-darwin" ]; }; passthru = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1271dded51a3..bee9a08873a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21212,7 +21212,7 @@ with pkgs; wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { 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-gtk2 = wxGTK30.override { withGtk2 = true; }; wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; };