Commit 760d6269 authored by Weijia Wang's avatar Weijia Wang
Browse files

wxGTK31: use new darwin sdk pattern

parent 85d6d1b1

pkgs/development/libraries/wxwidgets/wxGTK31.nix

+0 −18
Original line number Diff line number Diff line
@@ -23,14 +23,6 @@ 
  withWebKit ? stdenv.hostPlatform.isDarwin,

  webkitgtk_4_0,

  setfile,

  AGL,

  Carbon,

  Cocoa,

  Kernel,

  QTKit,

  AVFoundation,

  AVKit,

  WebKit,

}:



stdenv.mkDerivation rec {
@@ -68,20 +60,10 @@ stdenv.mkDerivation rec { 
    ++ lib.optional withCurl curl

    ++ lib.optional withMesa libGLU

    ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0

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

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      setfile

      Carbon

      Cocoa

      Kernel

      QTKit

      AVFoundation

      AVKit

      WebKit

    ];



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



  configureFlags =

    [

      "--disable-precomp-headers"

pkgs/top-level/all-packages.nix

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














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















    inherit (darwin.stubs) setfile;













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















  };





























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