Skip to content

python3Packages.wxPython_4_0: build on darwin #97101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 3 commits into from
Jan 15, 2021
Merged

python3Packages.wxPython_4_0: build on darwin #97101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27830c7
wxmac: 3.0.4 -> 3.0.5.1
fricklerhandwerk Jan 14, 2021
a0c2948
python3Packages.wxpython_4_0: fix darwin build
fricklerhandwerk Jan 14, 2021
bb2879d
mavproxy: fix darwin build
fricklerhandwerk Jan 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions pkgs/applications/science/robotics/mavproxy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial
, setuptools, wxPython_4_0 }:
{ stdenv, lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial
, setuptools, wxPython_4_0, billiard, gnureadline }:

buildPythonApplication rec {
pname = "MAVProxy";
Expand All @@ -10,14 +10,19 @@ buildPythonApplication rec {
sha256 = "fe046481b793b592334749249620fce8a463f4c46b394ff744645975465d677b";
};

postPatch = ''
substituteInPlace setup.py \
--replace "opencv-python" ""
'';

propagatedBuildInputs = [
matplotlib
numpy
pymavlink
pyserial
setuptools
wxPython_4_0
];
] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ];

# No tests
doCheck = false;
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/libraries/wxwidgets/3.0/mac.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchzip, expat, libiconv, libjpeg, libpng, libtiff, zlib
# darwin only attributes
, derez, rez, setfile
, AGL, Cocoa, Kernel
, AGL, Cocoa, Kernel, WebKit
}:

stdenv.mkDerivation rec {
version = "3.0.4";
version = "3.0.5.1";
pname = "wxmac";

src = fetchzip {
Expand All @@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
expat libiconv libjpeg libpng libtiff zlib
derez rez setfile
AGL Cocoa Kernel
AGL Cocoa Kernel WebKit
];

postPatch = ''
Expand Down
24 changes: 20 additions & 4 deletions pkgs/development/python-modules/wxPython/4.0.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,18 @@
, python
, doxygen
, ncurses
, wxGTK
, libintl
, numpy
, pillow
, six
, wxGTK
, wxmac
, IOKit
, Carbon
, Cocoa
, AudioToolbox
, OpenGL
, CoreFoundation
}:

buildPythonPackage rec {
Expand All @@ -26,8 +34,16 @@ buildPythonPackage rec {

doCheck = false;

nativeBuildInputs = [ pkgconfig which doxygen wxGTK ];
buildInputs = [ ncurses wxGTK.gtk ];
nativeBuildInputs = [ pkgconfig which doxygen ]
Copy link
Member

@SuperSandro2000 SuperSandro2000 Dec 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
nativeBuildInputs = [ pkgconfig which doxygen ]
nativeBuildInputs = [ pkg-config which doxygen ]

Copy link
Contributor Author

@fricklerhandwerk fricklerhandwerk Dec 27, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll have to check that, did that package name change recently? Right now it is passed as pkgconfig in the arguments...

Copy link
Member

@SuperSandro2000 SuperSandro2000 Dec 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We renamed pkgconfig to pkg-config but if this is the python module that it is still the same name. I am confused now.

Copy link
Contributor Author

@fricklerhandwerk fricklerhandwerk Dec 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything in pkgs/top-level/python-packages.nix passes pkgs.pkgconfig. Doesn't look to me that we should change that here.

Copy link
Member

@SuperSandro2000 SuperSandro2000 Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a python package named pkgconfig and it would be great to distinguish them. Also eventually we want to remove the alias to pkgconfig. Also when things got changed recently we can't rely on how it is done everywhere else if everywhere else might not be changed yet.

++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]);

buildInputs = [ ncurses libintl ]
++ (if stdenv.isDarwin
then
[ AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL ]
else
[ wxGTK.gtk ]
);

DOXYGEN = "${doxygen}/bin/doxygen";

Expand All @@ -50,7 +66,7 @@ buildPythonPackage rec {
${python.interpreter} setup.py install --skip-build --prefix=$out
'';

passthru = { inherit wxGTK; };
passthru = { wxWidgets = if stdenv.isDarwin then wxmac else wxGTK; };


meta = {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16883,7 +16883,7 @@ in
};

wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix {
inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel;
inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit;
inherit (darwin.stubs) setfile rez derez;
};

Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8121,6 +8121,7 @@ in {

wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix {
inherit (pkgs) pkgconfig;
inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL;
wxGTK = pkgs.wxGTK30.override {
withGtk2 = false;
withWebKit = true;
Expand Down