Merge pull request #161678 from AndersonTorres/new-misc
wxwidgets: remove darwin from inputs
This commit is contained in:
commit
36fae616c6
|
@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
|
|||
database support, HTML viewing and printing, and much more.
|
||||
'';
|
||||
license = licenses.wxWindows;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
|
|
|
@ -14,14 +14,15 @@
|
|||
, compat26 ? true
|
||||
, unicode ? true
|
||||
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
||||
, darwin
|
||||
, AGL
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, Kernel
|
||||
, QuickTime
|
||||
, setfile
|
||||
}:
|
||||
|
||||
assert withMesa -> libGLU != null && libGL != null;
|
||||
let
|
||||
inherit (darwin.stubs) setfile;
|
||||
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wxGTK";
|
||||
version = "2.9.5";
|
||||
|
@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
# https://github.com/wxWidgets/wxWidgets/issues/17942
|
||||
../0001-fix-assertion-using-hide-in-destroy.patch
|
||||
../patches/0001-fix-assertion-using-hide-in-destroy.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -115,7 +116,7 @@ stdenv.mkDerivation rec {
|
|||
database support, HTML viewing and printing, and much more.
|
||||
'';
|
||||
license = licenses.wxWindows;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.darwin ++ platforms.linux;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
};
|
||||
|
|
|
@ -17,14 +17,17 @@
|
|||
, unicode ? true
|
||||
, withGtk2 ? true
|
||||
, withWebKit ? false, webkitgtk
|
||||
, darwin
|
||||
, AGL
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, Kernel
|
||||
, QTKit
|
||||
, setfile
|
||||
}:
|
||||
|
||||
assert withGtk2 -> (!withWebKit);
|
||||
|
||||
let
|
||||
inherit (darwin.stubs) setfile;
|
||||
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
gtk = if withGtk2 then gtk2 else gtk3;
|
||||
in
|
||||
|
@ -66,7 +69,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
# https://github.com/wxWidgets/wxWidgets/issues/17942
|
||||
../0001-fix-assertion-using-hide-in-destroy.patch
|
||||
../patches/0001-fix-assertion-using-hide-in-destroy.patch
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
|
@ -126,7 +129,7 @@ stdenv.mkDerivation rec {
|
|||
database support, HTML viewing and printing, and much more.
|
||||
'';
|
||||
license = licenses.wxWindows;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
badPlatforms = [ "x86_64-darwin" ];
|
||||
};
|
||||
|
|
|
@ -20502,20 +20502,26 @@ with pkgs;
|
|||
wxformbuilder = callPackage ../development/tools/wxformbuilder { };
|
||||
|
||||
wxGTK = wxGTK28;
|
||||
|
||||
wxGTK30 = wxGTK30-gtk2;
|
||||
wxGTK31 = wxGTK31-gtk2;
|
||||
|
||||
wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { };
|
||||
|
||||
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { };
|
||||
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
|
||||
inherit (darwin.stubs) setfile;
|
||||
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
|
||||
};
|
||||
|
||||
wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {
|
||||
withGtk2 = true;
|
||||
inherit (darwin.stubs) setfile;
|
||||
inherit (darwin.apple_sdk.frameworks) AGL 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;
|
||||
};
|
||||
|
||||
wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {
|
||||
|
|
Loading…
Reference in a new issue