diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-07-31 14:44:49 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2018-07-31 14:44:49 +0100 |
commit | 71b579f9d49e3df0e3e4a6e1478adfc4e52e6aad (patch) | |
tree | 624039672ebd97f5a156793abef5925a2c2ec2a1 | |
parent | 611f0ed188622471c154e7122f27017a4ae0112b (diff) | |
download | nixlib-71b579f9d49e3df0e3e4a6e1478adfc4e52e6aad.tar nixlib-71b579f9d49e3df0e3e4a6e1478adfc4e52e6aad.tar.gz nixlib-71b579f9d49e3df0e3e4a6e1478adfc4e52e6aad.tar.bz2 nixlib-71b579f9d49e3df0e3e4a6e1478adfc4e52e6aad.tar.lz nixlib-71b579f9d49e3df0e3e4a6e1478adfc4e52e6aad.tar.xz nixlib-71b579f9d49e3df0e3e4a6e1478adfc4e52e6aad.tar.zst nixlib-71b579f9d49e3df0e3e4a6e1478adfc4e52e6aad.zip |
kicad: remove scripting flag for simplicity
-rw-r--r-- | pkgs/applications/science/electronics/kicad/default.nix | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index b67ff0f4ef59..3e783d2e177c 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -4,7 +4,7 @@ , wrapGAppsHook , oceSupport ? true, opencascade , ngspiceSupport ? true, libngspice -, scriptingSupport ? true, swig, python, pythonPackages +, swig, python, pythonPackages }: assert ngspiceSupport -> libngspice != null; @@ -25,17 +25,15 @@ stdenv.mkDerivation rec { --replace no-vcs-found ${version} ''; - cmakeFlags = - optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ] - ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON" - ++ optionals (scriptingSupport) [ - "-DKICAD_SCRIPTING=ON" - "-DKICAD_SCRIPTING_MODULES=ON" - "-DKICAD_SCRIPTING_WXPYTHON=ON" - # nix installs wxPython headers in wxPython package, not in wxwidget - # as assumed. We explicitely set the header location. - "-DCMAKE_CXX_FLAGS=-I${pythonPackages.wxPython}/include/wx-3.0" - ]; + cmakeFlags = [ + "-DKICAD_SCRIPTING=ON" + "-DKICAD_SCRIPTING_MODULES=ON" + "-DKICAD_SCRIPTING_WXPYTHON=ON" + # nix installs wxPython headers in wxPython package, not in wxwidget + # as assumed. We explicitely set the header location. + "-DCMAKE_CXX_FLAGS=-I${pythonPackages.wxPython}/include/wx-3.0" + ] ++ optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ] + ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"; nativeBuildInputs = [ # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html @@ -51,9 +49,9 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost + swig python ] ++ optional (oceSupport) opencascade - ++ optional (ngspiceSupport) libngspice - ++ optionals (scriptingSupport) [ swig python ]; + ++ optional (ngspiceSupport) libngspice; # this breaks other applications in kicad dontWrapGApps = true; |