diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-02 13:56:38 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-02 13:56:38 +0100 |
| commit | 05c62669b92f434943ad301e829c535c6731ad5f (patch) | |
| tree | 413755cb217cded48b34205f13699b05b08b3fcb | |
| parent | 8ba79e5af949b94e7fa6a46ba08533533a12153d (diff) | |
| download | nixlib-05c62669b92f434943ad301e829c535c6731ad5f.tar nixlib-05c62669b92f434943ad301e829c535c6731ad5f.tar.gz nixlib-05c62669b92f434943ad301e829c535c6731ad5f.tar.bz2 nixlib-05c62669b92f434943ad301e829c535c6731ad5f.tar.lz nixlib-05c62669b92f434943ad301e829c535c6731ad5f.tar.xz nixlib-05c62669b92f434943ad301e829c535c6731ad5f.tar.zst nixlib-05c62669b92f434943ad301e829c535c6731ad5f.zip | |
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.
| -rw-r--r-- | pkgs/development/python-modules/wxPython/3.0.nix | 5 | ||||
| -rw-r--r-- | 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 abce4cf44e0c..427b46f44eee 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 0b5575243758..59de07a991ee 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 { }; |