From 05c62669b92f434943ad301e829c535c6731ad5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Feb 2019 13:56:38 +0100
Subject: [PATCH] pythonPackages.wxPython: fixup build

I'm not sure why/when it started failing, but adding pkgconfig
shouldn't hurt anything.  I see no indication that
pythonPackages.pkgconfig was meant.
---
 pkgs/development/python-modules/wxPython/3.0.nix | 5 ++---
 pkgs/top-level/python-packages.nix               | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix
index abce4cf44e0..427b46f44ee 100644
--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/pkgs/development/python-modules/wxPython/3.0.nix
@@ -33,7 +33,8 @@ buildPythonPackage rec {
 
   hardeningDisable = [ "format" ];
 
-  propagatedBuildInputs = [ pkgconfig ]
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ ]
     ++ (lib.optional openglSupport pyopengl)
     ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK (wxGTK.gtk) libX11 ])
     ++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ])
@@ -60,8 +61,6 @@ buildPythonPackage rec {
       ]}'
   '';
 
-  NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lX11 -lgdk-x11-2.0";
-
   buildPhase = "";
 
   installPhase = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b557524375..59de07a991e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4228,6 +4228,7 @@ in {
 
   wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix {
     wxGTK = pkgs.wxGTK30;
+    inherit (pkgs) pkgconfig;
   };
 
   xml2rfc = callPackage ../development/python-modules/xml2rfc { };