pyrox.dev / nixpkgs
lol
fork atom

wxwidgets: remove darwin from inputs

Sandro Jäckel ee2f1269 a5eb7d85

+41 -20
unified split
+6 -5
pkgs/development/libraries/wxwidgets/wxGTK29.nix
··· 14 14 , compat26 ? true 15 15 , unicode ? true 16 16 , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms 17 - , darwin 17 + , setfile 18 + , AGL 19 + , Carbon 20 + , Cocoa 21 + , Kernel 22 + , QuickTime 18 23 }: 19 24 20 - let 21 - inherit (darwin.stubs) setfile; 22 - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; 23 - in 24 25 stdenv.mkDerivation rec { 25 26 pname = "wxGTK"; 26 27 version = "2.9.5";
+6 -3
pkgs/development/libraries/wxwidgets/wxGTK30.nix
··· 17 17 , unicode ? true 18 18 , withGtk2 ? true 19 19 , withWebKit ? false, webkitgtk 20 - , darwin 20 + , setfile 21 + , AGL 22 + , Carbon 23 + , Cocoa 24 + , Kernel 25 + , QTKit 21 26 }: 22 27 23 28 assert withGtk2 -> (!withWebKit); 24 29 25 30 let 26 - inherit (darwin.stubs) setfile; 27 - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; 28 31 inherit (gst_all_1) gstreamer gst-plugins-base; 29 32 gtk = if withGtk2 then gtk2 else gtk3; 30 33 in
+6 -3
pkgs/development/libraries/wxwidgets/wxGTK31.nix
··· 20 20 , withGtk2 ? true 21 21 , withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms 22 22 , withWebKit ? false, webkitgtk 23 - , darwin 23 + , setfile 24 + , AGL 25 + , Carbon 26 + , Cocoa 27 + , Kernel 28 + , QTKit 24 29 }: 25 30 26 31 assert withGtk2 -> (!withWebKit); 27 32 28 33 let 29 - inherit (darwin.stubs) setfile; 30 - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; 31 34 inherit (gnome2) GConf; 32 35 inherit (gst_all_1) gst-plugins-base gstreamer; 33 36 gtk = if withGtk2 then gtk2 else gtk3;
+7 -5
pkgs/development/libraries/wxwidgets/wxmac30.nix
··· 7 7 , libpng 8 8 , libtiff 9 9 , zlib 10 - , darwin 10 + , AGL 11 + , Cocoa 12 + , Kernel 13 + , WebKit 14 + , derez 15 + , rez 16 + , setfile 11 17 }: 12 18 13 - let 14 - inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; 15 - inherit (darwin.stubs) derez rez setfile; 16 - in 17 19 stdenv.mkDerivation rec { 18 20 pname = "wxmac"; 19 21 version = "3.0.5.1";
+16 -4
pkgs/top-level/all-packages.nix
··· 20509 20509 wxGTK = wxGTK28; 20510 20510 20511 20511 wxGTK28 = callPackage ../development/libraries/wxwidgets/wxGTK28.nix { }; 20512 - wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { }; 20513 - wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { }; 20514 - wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { }; 20515 - wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { }; 20512 + wxGTK29 = callPackage ../development/libraries/wxwidgets/wxGTK29.nix { 20513 + inherit (darwin.stubs) setfile; 20514 + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; 20515 + }; 20516 + wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { 20517 + inherit (darwin.stubs) setfile; 20518 + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; 20519 + }; 20520 + wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix { 20521 + inherit (darwin.stubs) setfile; 20522 + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; 20523 + }; 20524 + wxmac = callPackage ../development/libraries/wxwidgets/wxmac30.nix { 20525 + inherit (darwin.stubs) derez rez setfile; 20526 + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel WebKit; 20527 + }; 20516 20528 20517 20529 wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; }; 20518 20530 wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; };