From 5776e6c99bb9bed65197792f803656a53f788911 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Sat, 31 Dec 2016 03:03:51 +0100 Subject: [PATCH] wxGTK30: added Darwin support --- pkgs/development/libraries/wxGTK-3.0/default.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index 313e99f1087..5c45b29ec5c 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -2,6 +2,7 @@ , gstreamer, gst_plugins_base, GConf, setfile , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true , withWebKit ? false, webkitgtk2 ? null +, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: @@ -26,10 +27,12 @@ stdenv.mkDerivation { gst_plugins_base GConf ] ++ optional withMesa mesa ++ optional withWebKit webkitgtk2 - ++ optional stdenv.isDarwin setfile; + ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = optional stdenv.isDarwin AGL; + configureFlags = [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" (if compat24 then "--enable-compat24" else "--disable-compat24") @@ -38,7 +41,7 @@ stdenv.mkDerivation { ++ optional withMesa "--with-opengl" ++ optionals stdenv.isDarwin # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" ] + [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ] ++ optionals withWebKit ["--enable-webview" "--enable-webview-webkit"]; @@ -52,6 +55,9 @@ stdenv.mkDerivation { substituteInPlace configure --replace \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' + substituteInPlace configure --replace \ + "-framework System" \ + -lSystem ''; postInstall = " @@ -66,6 +72,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; darwin ++ linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 334ee02ebcc..cbc393531aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9686,6 +9686,7 @@ in wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix { inherit (gnome2) GConf; inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; withMesa = lib.elem system lib.platforms.mesaPlatforms; };