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 { };