pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #97101 from fricklerhandwerk/wxpython

authored by

Sandro and committed by
GitHub 403ea9f2 cc2462d4

+33 -11
unified split
+8 -3
pkgs/applications/science/robotics/mavproxy/default.nix
··· 1 - { lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial 2 - , setuptools, wxPython_4_0 }: 1 + { stdenv, lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial 2 + , setuptools, wxPython_4_0, billiard, gnureadline }: 3 3 4 4 buildPythonApplication rec { 5 5 pname = "MAVProxy"; ··· 10 10 sha256 = "fe046481b793b592334749249620fce8a463f4c46b394ff744645975465d677b"; 11 11 }; 12 12 13 + postPatch = '' 14 + substituteInPlace setup.py \ 15 + --replace "opencv-python" "" 16 + ''; 17 + 13 18 propagatedBuildInputs = [ 14 19 matplotlib 15 20 numpy ··· 17 22 pyserial 18 23 setuptools 19 24 wxPython_4_0 20 - ]; 25 + ] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ]; 21 26 22 27 # No tests 23 28 doCheck = false;
+3 -3
pkgs/development/libraries/wxwidgets/3.0/mac.nix
··· 1 1 { stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib 2 2 # darwin only attributes 3 3 , derez, rez, setfile 4 - , AGL, Cocoa, Kernel 4 + , AGL, Cocoa, Kernel, WebKit 5 5 }: 6 6 7 7 stdenv.mkDerivation rec { 8 - version = "3.0.4"; 8 + version = "3.0.5.1"; 9 9 pname = "wxmac"; 10 10 11 11 src = fetchzip { ··· 16 16 buildInputs = [ 17 17 expat libiconv libjpeg libpng libtiff zlib 18 18 derez rez setfile 19 - AGL Cocoa Kernel 19 + AGL Cocoa Kernel WebKit 20 20 ]; 21 21 22 22 postPatch = ''
+20 -4
pkgs/development/python-modules/wxPython/4.0.nix
··· 9 9 , python 10 10 , doxygen 11 11 , ncurses 12 - , wxGTK 12 + , libintl 13 13 , numpy 14 14 , pillow 15 15 , six 16 + , wxGTK 17 + , wxmac 18 + , IOKit 19 + , Carbon 20 + , Cocoa 21 + , AudioToolbox 22 + , OpenGL 23 + , CoreFoundation 16 24 }: 17 25 18 26 buildPythonPackage rec { ··· 26 34 27 35 doCheck = false; 28 36 29 - nativeBuildInputs = [ pkgconfig which doxygen wxGTK ]; 30 - buildInputs = [ ncurses wxGTK.gtk ]; 37 + nativeBuildInputs = [ pkgconfig which doxygen ] 38 + ++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]); 39 + 40 + buildInputs = [ ncurses libintl ] 41 + ++ (if stdenv.isDarwin 42 + then 43 + [ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ] 44 + else 45 + [ wxGTK.gtk ] 46 + ); 31 47 32 48 DOXYGEN = "${doxygen}/bin/doxygen"; 33 49 ··· 50 66 ${python.interpreter} setup.py install --skip-build --prefix=$out 51 67 ''; 52 68 53 - passthru = { inherit wxGTK; }; 69 + passthru = { wxWidgets = if stdenv.isDarwin then wxmac else wxGTK; }; 54 70 55 71 56 72 meta = {
+1 -1
pkgs/top-level/all-packages.nix
··· 17090 17090 }; 17091 17091 17092 17092 wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { 17093 - inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; 17093 + inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; 17094 17094 inherit (darwin.stubs) setfile rez derez; 17095 17095 }; 17096 17096
+1
pkgs/top-level/python-packages.nix
··· 8143 8143 8144 8144 wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { 8145 8145 inherit (pkgs) pkgconfig; 8146 + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; 8146 8147 wxGTK = pkgs.wxGTK30.override { 8147 8148 withGtk2 = false; 8148 8149 withWebKit = true;