Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 75ee83deebf8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: da66a6359f61
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 3, 2019

  1. wxPython: fix build 

    (cherry picked from commit 1285d73)
    @FRidh
    FRidh committed Mar 3, 2019
    Copy the full SHA
    da66a63 View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 pkgs/development/python-modules/wxPython/3.0.nix
14 changes: 8 additions & 6 deletions pkgs/development/python-modules/wxPython/3.0.nix
View file
Original file line number Diff line number Diff line change
@@ -33,12 +33,14 @@ buildPythonPackage rec {

hardeningDisable = [ "format" ];

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 ])
;
nativeBuildInputs = [ pkgconfig ]
++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ])
++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ]);

buildInputs = [ ]
++ (lib.optionals (!stdenv.isDarwin) [ (wxGTK.gtk) ])
++ (lib.optional openglSupport pyopengl);

preConfigure = ''
cd wxPython
# remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch