3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #127768 from deliciouslytyped/wxpython

python3Packages.wxPython_4_0, python3Packages.wxPython_4_1: add numpy…
This commit is contained in:
Sandro 2021-06-22 17:56:49 +02:00 committed by GitHub
commit 52a64db282
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions

View file

@ -18,6 +18,8 @@
, AudioToolbox , AudioToolbox
, OpenGL , OpenGL
, CoreFoundation , CoreFoundation
, pillow
, numpy
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -42,6 +44,8 @@ buildPythonPackage rec {
[ wxGTK.gtk ] [ wxGTK.gtk ]
); );
propagatedBuildInputs = [ pillow numpy ];
DOXYGEN = "${doxygen}/bin/doxygen"; DOXYGEN = "${doxygen}/bin/doxygen";
preConfigure = lib.optionalString (!stdenv.isDarwin) '' preConfigure = lib.optionalString (!stdenv.isDarwin) ''

View file

@ -11,6 +11,8 @@
, ncurses , ncurses
, pango , pango
, wxGTK , wxGTK
, pillow
, numpy
}: }:
let let
dynamic-linker = stdenv.cc.bintools.dynamicLinker; dynamic-linker = stdenv.cc.bintools.dynamicLinker;
@ -36,6 +38,8 @@ buildPythonPackage rec {
ncurses ncurses
]; ];
propagatedBuildInputs = [ pillow numpy ];
DOXYGEN = "${doxygen}/bin/doxygen"; DOXYGEN = "${doxygen}/bin/doxygen";
preConfigure = lib.optionalString (!stdenv.isDarwin) '' preConfigure = lib.optionalString (!stdenv.isDarwin) ''