Merge #44910: cmake: 3.11.2 -> 3.12.1

2018-08-30 16:04:52 +02:00
parent 6f2f91f307 e841ffec18
commit b71b222b4c
8 changed files with 132 additions and 162 deletions
@@ -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
@@ -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