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: 0cf81af50c25
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5af0d0b5da47
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 20, 2019

  1. kicad: fix build

    Fix configure time error:
      ...
      ImportError: No module named wx
      CMake Error at CMakeModules/FindwxPython.cmake:52 (message):
        wxPython/Phoenix does not appear to be installed on the system
    
    Only build tested.
    
    Fixes: f7e28bf ("Split buildPythonPackage into setup hooks")
    bjornfor committed Sep 20, 2019
    Copy the full SHA
    5af0d0b View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/science/electronics/kicad/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/science/electronics/kicad/default.nix
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs
cairo curl openssl boost
swig python
swig (python.withPackages (ps: with ps; [ wxPython ]))
] ++ optional (oceSupport) opencascade
++ optional (ngspiceSupport) libngspice;