wxwidgets: remove darwin from inputs
This commit is contained in:
parent
a5eb7d85c8
commit
ee2f1269d0
|
@ -14,13 +14,14 @@
|
|||
, compat26 ? true
|
||||
, unicode ? true
|
||||
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
||||
, darwin
|
||||
, setfile
|
||||
, AGL
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, Kernel
|
||||
, QuickTime
|
||||
}:
|
||||
|
||||
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";
|
||||
|
|
|
@ -17,14 +17,17 @@
|
|||
, unicode ? true
|
||||
, withGtk2 ? true
|
||||
, withWebKit ? false, webkitgtk
|
||||
, darwin
|
||||
, setfile
|
||||
, AGL
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, Kernel
|
||||
, QTKit
|
||||
}:
|
||||
|
||||
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
|
||||
|
|
|
@ -20,14 +20,17 @@
|
|||
, withGtk2 ? true
|
||||
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
|
||||
, withWebKit ? false, webkitgtk
|
||||
, darwin
|
||||
, setfile
|
||||
, AGL
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, Kernel
|
||||
, QTKit
|
||||
}:
|
||||
|
||||
assert withGtk2 -> (!withWebKit);
|
||||
|
||||
let
|
||||
inherit (darwin.stubs) setfile;
|
||||
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
|
||||
inherit (gnome2) GConf;
|
||||
inherit (gst_all_1) gst-plugins-base gstreamer;
|
||||
gtk = if withGtk2 then gtk2 else gtk3;
|
||||
|
|
|
@ -7,13 +7,15 @@
|
|||
, libpng
|
||||
, libtiff
|
||||
, zlib
|
||||
, darwin
|
||||
, AGL
|
||||
, Cocoa
|
||||
, Kernel
|
||||
, WebKit
|
||||
, derez
|
||||
, rez
|
||||
, setfile
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit;
|
||||
inherit (darwin.stubs) derez rez setfile;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wxmac";
|
||||
version = "3.0.5.1";
|
||||
|
|
|
@ -20509,10 +20509,22 @@ with pkgs;
|
|||
wxGTK = wxGTK28;
|
||||
|
||||
wxGTK28 = callPackage ../development/libraries/wxwidgets/wxGTK28.nix { };
|
||||
wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { };
|
||||
wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { };
|
||||
wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { };
|
||||
wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { };
|
||||
wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix {
|
||||
inherit (darwin.stubs) setfile;
|
||||
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
|
||||
};
|
||||
wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix {
|
||||
inherit (darwin.stubs) setfile;
|
||||
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
|
||||
};
|
||||
wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix {
|
||||
inherit (darwin.stubs) setfile;
|
||||
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
|
||||
};
|
||||
wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix {
|
||||
inherit (darwin.stubs) derez rez setfile;
|
||||
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel WebKit;
|
||||
};
|
||||
|
||||
wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; };
|
||||
wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; };
|
||||
|
|
Loading…
Reference in a new issue