diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-30 16:04:52 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-30 16:04:52 +0200 |
| commit | b71b222b4cce67af6c0d305f5bf735f83239b93e (patch) | |
| tree | f891a820d35767054141e0c0232dff569f3ee865 /pkgs/applications/science | |
| parent | 6f2f91f3070631cad8eca4569663a859ddd3774c (diff) | |
| parent | e841ffec180ea911148a0147cea5e656d79802b3 (diff) | |
| download | nixlib-b71b222b4cce67af6c0d305f5bf735f83239b93e.tar nixlib-b71b222b4cce67af6c0d305f5bf735f83239b93e.tar.gz nixlib-b71b222b4cce67af6c0d305f5bf735f83239b93e.tar.bz2 nixlib-b71b222b4cce67af6c0d305f5bf735f83239b93e.tar.lz nixlib-b71b222b4cce67af6c0d305f5bf735f83239b93e.tar.xz nixlib-b71b222b4cce67af6c0d305f5bf735f83239b93e.tar.zst nixlib-b71b222b4cce67af6c0d305f5bf735f83239b93e.zip | |
Merge #44910: cmake: 3.11.2 -> 3.12.1
Diffstat (limited to 'pkgs/applications/science')
| -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 |