Commit 90660e8d authored by Weijia Wang's avatar Weijia Wang
Browse files

wxGTK32: use new darwin sdk pattern

parent 760d6269

pkgs/development/libraries/wxwidgets/wxGTK32.nix

+0 −18
Original line number Diff line number Diff line
@@ -25,14 +25,6 @@ 
, withWebKit ? true

, webkitgtk_4_0

, setfile

, AGL

, Carbon

, Cocoa

, Kernel

, QTKit

, AVFoundation

, AVKit

, WebKit

}:

let

  catch = fetchFromGitHub {
@@ -81,21 +73,11 @@ stdenv.mkDerivation rec { 
  ]

  ++ lib.optional withMesa libGLU

  ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0

  ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    expat

    setfile

    Carbon

    Cocoa

    Kernel

    QTKit

    AVFoundation

    AVKit

    WebKit

  ];



  propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL;



  configureFlags = [

    "--disable-precomp-headers"

    # This is the default option, but be explicit

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -10969,7 +10969,6 @@ with pkgs; 














  wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix {















    inherit (darwin.stubs) setfile;













    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;















  };





























  wxSVG = callPackage ../development/libraries/wxSVG {