summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorEvils <evils.devils@protonmail.com>2021-06-05 13:28:53 +0200
committerEvils <evils.devils@protonmail.com>2021-07-13 12:47:26 +0200
commit0e6d18690605292fed9f4f1a2cf057788fba60ce (patch)
tree9868c872bcbb467b0f326ab384be0545553e29fb /pkgs/applications/science
parent428d2a2f5179fb39644d846b541880cd506c8e8b (diff)
downloadnixpkgs-0e6d18690605292fed9f4f1a2cf057788fba60ce.tar
nixpkgs-0e6d18690605292fed9f4f1a2cf057788fba60ce.tar.gz
nixpkgs-0e6d18690605292fed9f4f1a2cf057788fba60ce.tar.bz2
nixpkgs-0e6d18690605292fed9f4f1a2cf057788fba60ce.tar.lz
nixpkgs-0e6d18690605292fed9f4f1a2cf057788fba60ce.tar.xz
nixpkgs-0e6d18690605292fed9f4f1a2cf057788fba60ce.tar.zst
nixpkgs-0e6d18690605292fed9f4f1a2cf057788fba60ce.zip
kicad-unstable: needs python
needed since upstream merge request 796 got merged on 2021-06-01
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/electronics/kicad/base.nix12
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix
index 9848eb58399..596083c2709 100644
--- a/pkgs/applications/science/electronics/kicad/base.nix
+++ b/pkgs/applications/science/electronics/kicad/base.nix
@@ -62,6 +62,7 @@ assert lib.assertMsg (!(stable && (sanitizeAddress || sanitizeThreads)))
   "Only kicad-unstable(-small) supports address/thread sanitation";
 assert lib.assertMsg (!(sanitizeAddress && sanitizeThreads))
   "'sanitizeAddress' and 'sanitizeThreads' are mutually exclusive, use one.";
+
 let
   inherit (lib) optional optionals;
 in
@@ -81,14 +82,16 @@ stdenv.mkDerivation rec {
 
   makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ];
 
-  cmakeFlags = optionals (withScripting) [
+  cmakeFlags = optionals (stable && withScripting) [
     "-DKICAD_SCRIPTING=ON"
     "-DKICAD_SCRIPTING_MODULES=ON"
     "-DKICAD_SCRIPTING_PYTHON3=ON"
     "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON"
   ]
-  ++ optional (!withScripting)
+  ++ optionals (!withScripting) [
     "-DKICAD_SCRIPTING=OFF"
+    "-DKICAD_SCRIPTING_WXPYTHON=OFF"
+  ]
   ++ optional (withNgspice) "-DKICAD_SPICE=ON"
   ++ optional (!withOCE) "-DKICAD_USE_OCE=OFF"
   ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF"
@@ -152,7 +155,10 @@ stdenv.mkDerivation rec {
     openssl
     boost
   ]
-  ++ optionals (withScripting) [ swig python wxPython ]
+  # unstable requires swig and python
+  # wxPython still optional
+  ++ optionals (withScripting || (!stable)) [ swig python ]
+  ++ optional (withScripting) wxPython
   ++ optional (withNgspice) libngspice
   ++ optional (withOCE) opencascade
   ++ optional (withOCC) opencascade-occt