colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kicad: remove scripting flag for simplicity

Browse Source
This commit is contained in:
Jörg Thalheim 2018-07-31 14:44:49 +01:00
parent 611f0ed188
commit 71b579f9d4
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/science/electronics/kicad/default.nix
View File

@ -4,7 +4,7 @@
, wrapGAppsHook , wrapGAppsHook
, oceSupport ? true, opencascade , oceSupport ? true, opencascade
, ngspiceSupport ? true, libngspice , ngspiceSupport ? true, libngspice
, scriptingSupport ? true, swig, python, pythonPackages , swig, python, pythonPackages
}: }:
assert ngspiceSupport -> libngspice != null; assert ngspiceSupport -> libngspice != null;
@ -25,17 +25,15 @@ stdenv.mkDerivation rec {
--replace no-vcs-found ${version} --replace no-vcs-found ${version}
''; '';
cmakeFlags = cmakeFlags = [
optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ] "-DKICAD_SCRIPTING=ON"
++ optional (ngspiceSupport) "-DKICAD_SPICE=ON" "-DKICAD_SCRIPTING_MODULES=ON"
++ optionals (scriptingSupport) [ "-DKICAD_SCRIPTING_WXPYTHON=ON"
"-DKICAD_SCRIPTING=ON" # nix installs wxPython headers in wxPython package, not in wxwidget
"-DKICAD_SCRIPTING_MODULES=ON" # as assumed. We explicitely set the header location.
"-DKICAD_SCRIPTING_WXPYTHON=ON" "-DCMAKE_CXX_FLAGS=-I${pythonPackages.wxPython}/include/wx-3.0"
# nix installs wxPython headers in wxPython package, not in wxwidget ] ++ optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
# as assumed. We explicitely set the header location. ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON";
"-DCMAKE_CXX_FLAGS=-I${pythonPackages.wxPython}/include/wx-3.0"
];
nativeBuildInputs = [ nativeBuildInputs = [
# https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html
@ -51,9 +49,9 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
cairo curl openssl boost cairo curl openssl boost
swig python
] ++ optional (oceSupport) opencascade ] ++ optional (oceSupport) opencascade
++ optional (ngspiceSupport) libngspice ++ optional (ngspiceSupport) libngspice;
++ optionals (scriptingSupport) [ swig python ];
# this breaks other applications in kicad # this breaks other applications in kicad
dontWrapGApps = true; dontWrapGApps = true;