public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.wxPython: fixup build

Browse Source 
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.
This commit is contained in:
Vladimír Čunát 2019-02-02 13:56:38 +01:00
parent 8ba79e5af9
commit 05c62669b9
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/wxPython/3.0.nix
View File

@ -33,7 +33,8 @@ buildPythonPackage rec {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
propagatedBuildInputs = [ pkgconfig ] nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ ]
++ (lib.optional openglSupport pyopengl) ++ (lib.optional openglSupport pyopengl)
++ (lib.optionals (!stdenv.isDarwin) [ wxGTK (wxGTK.gtk) libX11 ]) ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK (wxGTK.gtk) libX11 ])
++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ]) ++ (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 = ""; buildPhase = "";
installPhase = '' installPhase = ''

1
pkgs/top-level/python-packages.nix
View File

@ -4228,6 +4228,7 @@ in {
wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix {
wxGTK = pkgs.wxGTK30; wxGTK = pkgs.wxGTK30;
inherit (pkgs) pkgconfig;
}; };
xml2rfc = callPackage ../development/python-modules/xml2rfc { }; xml2rfc = callPackage ../development/python-modules/xml2rfc { };