public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21539 from mdaiter/wxGTK30Mac

Browse Source 
wxGTK30: added Darwin support
This commit is contained in:
Daiderd Jordan 2016-12-31 14:11:58 +01:00 committed by GitHub
commit da34b32bb4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/wxGTK-3.0/default.nix
View File

@ -2,6 +2,7 @@
, 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
, withWebKit ? false, webkitgtk2 ? null , withWebKit ? false, webkitgtk2 ? null
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
}: }:
@ -26,10 +27,12 @@ stdenv.mkDerivation {
gst_plugins_base GConf ] gst_plugins_base GConf ]
++ optional withMesa mesa ++ optional withMesa mesa
++ optional withWebKit webkitgtk2 ++ optional withWebKit webkitgtk2
++ optional stdenv.isDarwin setfile; ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
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")
@ -38,7 +41,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" ]
++ optionals withWebKit ++ optionals withWebKit
["--enable-webview" "--enable-webview-webkit"]; ["--enable-webview" "--enable-webview-webkit"];
@ -52,6 +55,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 = "
@ -66,6 +72,6 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {
platforms = stdenv.lib.platforms.linux; platforms = with stdenv.lib.platforms; darwin ++ linux;
}; };
} }

1
pkgs/top-level/all-packages.nix
View File

@ -9693,6 +9693,7 @@ in
wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix { wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/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 QTKit;
withMesa = lib.elem system lib.platforms.mesaPlatforms; withMesa = lib.elem system lib.platforms.mesaPlatforms;
}; };