kicad: split wrapping and building

2020-01-02 03:45:34 +01:00
parent d96992a21b
commit 6119ca27bb
3 changed files with 64 additions and 130 deletions
@@ -11,6 +11,7 @@
 , ngspiceSupport ? true, libngspice
 , scriptingSupport ? true, swig, python, pythonPackages, wxPython
 , debug ? false, valgrind
+, with3d ? true
 , withI18n ? true
 }:

@@ -75,8 +76,10 @@ stdenv.mkDerivation rec {
    ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"
    ++ optional (!withOCE) "-DKICAD_USE_OCE=OFF"
    ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF"
-    ++ optionals (withOCE)
-      [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
+    ++ optionals (withOCE) [
+      "-DKICAD_USE_OCE=ON"
+      "-DOCE_DIR=${opencascade}"
+    ]
    ++ optionals (withOCC) [
      "-DKICAD_USE_OCC=ON"
      "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
@@ -88,10 +91,6 @@ stdenv.mkDerivation rec {
    ]
  ;

-  pythonPath =
-    optionals (scriptingSupport)
-      [ wxPython pythonPackages.six ];
-
  nativeBuildInputs = [ cmake doxygen pkgconfig lndir ];

  buildInputs = [