cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

wxGTK30-gtk2,wxGTK30-gtk3: add missing buildInput on Darwin

Browse source
This commit is contained in:
Malo Bourgon 2022-06-15 18:24:45 -07:00
parent d3f9ba06c2
commit d304496834
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/wxwidgets/wxGTK30.nix
View file

@ -18,6 +18,7 @@
, withGtk2 ? true , withGtk2 ? true
, withWebKit ? false, webkitgtk , withWebKit ? false, webkitgtk
, AGL , AGL
, AVFoundation
, Carbon , Carbon
, Cocoa , Cocoa
, Kernel , Kernel
@ -57,6 +58,7 @@ stdenv.mkDerivation rec {
++ lib.optional withMesa libGLU ++ lib.optional withMesa libGLU
++ lib.optional withWebKit webkitgtk ++ lib.optional withWebKit webkitgtk
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.isDarwin [
AVFoundation
Carbon Carbon
Cocoa Cocoa
Kernel Kernel
@ -130,7 +132,6 @@ stdenv.mkDerivation rec {
license = licenses.wxWindows; license = licenses.wxWindows;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
badPlatforms = [ "x86_64-darwin" ];
}; };
passthru = { passthru = {

2
pkgs/top-level/all-packages.nix
View file

@ -21212,7 +21212,7 @@ with pkgs;
wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix {
withGtk2 = true; withGtk2 = true;
inherit (darwin.stubs) setfile; 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-gtk2 = wxGTK30.override { withGtk2 = true; };
wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; }; wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; };