diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2018-08-13 08:47:02 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2018-08-13 11:05:54 +0900 |
| commit | 07bd1d873789039e17cc143293ad9ff723d500d2 (patch) | |
| tree | c094390e7f1b652c70a98e2d649d2f317fc23017 | |
| parent | 68ac282f8e8eff5f8e4bf51b09ebfbfbe5b76273 (diff) | |
| download | nixlib-07bd1d873789039e17cc143293ad9ff723d500d2.tar nixlib-07bd1d873789039e17cc143293ad9ff723d500d2.tar.gz nixlib-07bd1d873789039e17cc143293ad9ff723d500d2.tar.bz2 nixlib-07bd1d873789039e17cc143293ad9ff723d500d2.tar.lz nixlib-07bd1d873789039e17cc143293ad9ff723d500d2.tar.xz nixlib-07bd1d873789039e17cc143293ad9ff723d500d2.tar.zst nixlib-07bd1d873789039e17cc143293ad9ff723d500d2.zip | |
kicad: use default cmake
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/unstable.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 3e783d2e177c..c92da3eeb292 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"; nativeBuildInputs = [ - # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html - (cmake.override {majorVersion = "3.10";}) + cmake doxygen pkgconfig wrapGAppsHook diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index e43fd59e0431..a9a4c32a0b45 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -38,8 +38,7 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" ]; - # https://www.mail-archive.com/kicad-developers@lists.launchpad.net/msg29840.html - nativeBuildInputs = [ (cmake.override {majorVersion = "3.10";}) doxygen pkgconfig ]; + nativeBuildInputs = [ cmake doxygen pkgconfig ]; buildInputs = [ libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost |