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

kicad: use default cmake

Browse Source
This commit is contained in:
Andrew Childs 2018-08-13 08:47:02 +09:00
parent 68ac282f8e
commit 07bd1d8737
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"; ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON";
nativeBuildInputs = [ nativeBuildInputs = [
# https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html cmake
(cmake.override {majorVersion = "3.10";})
doxygen doxygen
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook

3
pkgs/applications/science/electronics/kicad/unstable.nix
View File

@ -38,8 +38,7 @@ stdenv.mkDerivation rec {
"-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0"
]; ];
# https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html nativeBuildInputs = [ cmake doxygen pkgconfig ];
nativeBuildInputs = [ (cmake.override {majorVersion = "3.10";}) doxygen pkgconfig ];
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