Merge pull request #21527 from mdaiter/wxGTK29Darwin
wxGTK29: fixed Darwin build
This commit is contained in:
commit
96aca6ccbf
|
@ -1,6 +1,7 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
|
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
|
||||||
, gstreamer, gst_plugins_base, GConf, setfile
|
, gstreamer, gst_plugins_base, GConf, setfile
|
||||||
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
|
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
|
||||||
|
, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert withMesa -> mesa != null;
|
assert withMesa -> mesa != null;
|
||||||
|
@ -22,10 +23,12 @@ stdenv.mkDerivation {
|
||||||
[ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
|
[ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
|
||||||
gst_plugins_base GConf ]
|
gst_plugins_base GConf ]
|
||||||
++ optional withMesa mesa
|
++ optional withMesa mesa
|
||||||
++ optional stdenv.isDarwin setfile;
|
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
||||||
|
propagatedBuildInputs = optional stdenv.isDarwin AGL;
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
|
[ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
|
||||||
(if compat24 then "--enable-compat24" else "--disable-compat24")
|
(if compat24 then "--enable-compat24" else "--disable-compat24")
|
||||||
|
@ -34,7 +37,7 @@ stdenv.mkDerivation {
|
||||||
++ optional withMesa "--with-opengl"
|
++ optional withMesa "--with-opengl"
|
||||||
++ optionals stdenv.isDarwin
|
++ optionals stdenv.isDarwin
|
||||||
# allow building on 64-bit
|
# allow building on 64-bit
|
||||||
[ "--with-cocoa" "--enable-universal-binaries" ];
|
[ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ];
|
||||||
|
|
||||||
SEARCH_LIB = optionalString withMesa "${mesa}/lib";
|
SEARCH_LIB = optionalString withMesa "${mesa}/lib";
|
||||||
|
|
||||||
|
@ -46,6 +49,9 @@ stdenv.mkDerivation {
|
||||||
substituteInPlace configure --replace \
|
substituteInPlace configure --replace \
|
||||||
'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
|
'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
|
||||||
'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
|
'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
|
||||||
|
substituteInPlace configure --replace \
|
||||||
|
"-framework System" \
|
||||||
|
-lSystem
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = "
|
postInstall = "
|
||||||
|
@ -60,6 +66,6 @@ stdenv.mkDerivation {
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = with stdenv.lib.platforms; darwin ++ linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -9675,6 +9675,7 @@ in
|
||||||
wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
|
wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
|
||||||
inherit (gnome2) GConf;
|
inherit (gnome2) GConf;
|
||||||
inherit (darwin.stubs) setfile;
|
inherit (darwin.stubs) setfile;
|
||||||
|
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
|
||||||
withMesa = lib.elem system lib.platforms.mesaPlatforms;
|
withMesa = lib.elem system lib.platforms.mesaPlatforms;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue