From: TimePath <andrew.hardaker1995@gmail.com>
Date: Wed, 2 Aug 2017 12:38:07 +0000 (+1000)
Subject: Update CMakeLists.txt
X-Git-Tag: xonotic-v0.8.5~193
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=591141a9ad63861c1bcd85bdd54bf726bef8e0d5;p=xonotic%2Fxonotic.git

Update CMakeLists.txt
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4116f5cd..e63f71f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 project(xonotic)
 
 option(DOWNLOAD_MAPS "Download new maps from the build server" ON)
diff --git a/default.nix b/default.nix
index 69485127..6e954f4c 100644
--- a/default.nix
+++ b/default.nix
@@ -8,6 +8,7 @@
 with pkgs;
 let
     VERSION = "0.8.2";
+    cmake = pkgs.cmake_2_8;
     targets = rec {
         xonotic = mkDerivation { pki = true; dp = true; data = true; } rec {
             name = "xonotic-${version}";