From 430936519c80b080462fd625c5b500f2d730cf1f Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 28 Jul 2020 17:20:43 -0400
Subject: [PATCH 1/3] python3Packages.wxPython_4_0: remove unused dependencies

The package contains no references to many of its declared dependencies, and
the build succeeds without them.
---
 .../python-modules/wxPython/4.0.nix           | 28 ++++---------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix
index e185e26a4f7e..53a3f6b1e319 100644
--- a/pkgs/development/python-modules/wxPython/4.0.nix
+++ b/pkgs/development/python-modules/wxPython/4.0.nix
@@ -1,29 +1,18 @@
 { lib
 , stdenv
-, openglSupport ? true
-, libX11
-, pyopengl
 , buildPythonPackage
 , fetchPypi
 , pkgconfig
-, libjpeg
-, libtiff
-, SDL
-, gst-plugins-base
-, libnotify
-, freeglut
-, xorg
 , which
 , cairo
-, requests
 , pango
-, pathlib2
 , python
 , doxygen
 , ncurses
-, libpng
-, gstreamer
 , wxGTK
+, numpy
+, pillow
+, six
 }:
 
 buildPythonPackage rec {
@@ -38,14 +27,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   nativeBuildInputs = [ pkgconfig which doxygen wxGTK ];
-
-  buildInputs = [ libjpeg libtiff SDL
-      gst-plugins-base libnotify freeglut xorg.libSM ncurses
-      requests libpng gstreamer libX11
-      pathlib2
-      (wxGTK.gtk)
-  ]
-    ++ lib.optional openglSupport pyopengl;
+  buildInputs = [ ncurses wxGTK.gtk ];
 
   hardeningDisable = [ "format" ];
 
@@ -71,7 +53,7 @@ buildPythonPackage rec {
     wrapPythonPrograms
   '';
 
-  passthru = { inherit wxGTK openglSupport; };
+  passthru = { inherit wxGTK; };
 
 
   meta = {

From 8b76b92065fa720bab7b5300f0018bd48a8549e1 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 28 Jul 2020 17:23:57 -0400
Subject: [PATCH 2/3] python3Packages.wxPython_4_0: enable format hardening

This was inherited from wxPython 3 and does not seem to be necessary.
---
 pkgs/development/python-modules/wxPython/4.0.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix
index 53a3f6b1e319..cd1e5b063bdb 100644
--- a/pkgs/development/python-modules/wxPython/4.0.nix
+++ b/pkgs/development/python-modules/wxPython/4.0.nix
@@ -29,8 +29,6 @@ buildPythonPackage rec {
   nativeBuildInputs = [ pkgconfig which doxygen wxGTK ];
   buildInputs = [ ncurses wxGTK.gtk ];
 
-  hardeningDisable = [ "format" ];
-
   DOXYGEN = "${doxygen}/bin/doxygen";
 
   preConfigure = lib.optionalString (!stdenv.isDarwin) ''

From 7f15e31671e6311fbf3f6ec0f5c154719cf3b61a Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Wed, 29 Jul 2020 00:33:53 -0400
Subject: [PATCH 3/3] python3Packages.wxPython_4_0: remove manual
 wrapPythonPrograms invocation

This was causing programs to be wrapped twice, as wrapping occurs automatically
during the fixup phase.
---
 pkgs/development/python-modules/wxPython/4.0.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix
index cd1e5b063bdb..406493362c46 100644
--- a/pkgs/development/python-modules/wxPython/4.0.nix
+++ b/pkgs/development/python-modules/wxPython/4.0.nix
@@ -48,7 +48,6 @@ buildPythonPackage rec {
 
   installPhase = ''
     ${python.interpreter} setup.py install --skip-build --prefix=$out
-    wrapPythonPrograms
   '';
 
   passthru = { inherit wxGTK; };