1 files changed, 22 insertions, 22 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 60a941a6637..20f6ad57b2b 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
-, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null
+{ stdenv, fetchurl
+, bzip2, curl, expat, jsoncpp, libarchive, xz, zlib
+, useNcurses ? false, ncurses, useQt4 ? false, qt4
 }:
 
 with stdenv.lib;
 
-assert wantPS -> (ps != null);
-
 let
   os = stdenv.lib.optionalString;
-  majorVersion = "2.8";
-  minorVersion = "12.2";
+  majorVersion = "3.2";
+  minorVersion = "1";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -20,20 +19,15 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc";
+    sha256 = "0b2hy4p0aa9zshlxyw9nmlh5q8q1lmnwmb594rvh6sx2n7v1r7vm";
   };
 
   enableParallelBuilding = true;
 
   patches =
-    [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959
-      name = "FindFreetype-2.5.patch";
-      url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
-      sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
-    })] ++
     # Don't search in non-Nix locations such as /usr, but do search in
-    # Nixpkgs' Glibc. 
-    optional (stdenv ? glibc) ./search-path.patch ++
+    # Nixpkgs' Glibc.
+    optional (stdenv ? glibc) ./search-path-3.0.patch ++
     optional (stdenv ? cross) (fetchurl {
       name = "fix-darwin-cross-compile.patch";
       url = "http://public.kitware.com/Bug/file_download.php?"
@@ -41,17 +35,22 @@ stdenv.mkDerivation rec {
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
     });
 
-  buildInputs = [ curl expat zlib bzip2 libarchive ]
+  buildInputs =
+    [ bzip2 curl expat libarchive xz zlib ]
+    ++ optional (jsoncpp != null) jsoncpp
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
-  propagatedBuildInputs = optional wantPS ps;
-
   CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
-  
+
   configureFlags =
-    "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
-    + stdenv.lib.optionalString useQt4 " --qt-gui";
+    [
+      "--docdir=/share/doc/${name}"
+      "--mandir=/share/man"
+      "--system-libs"
+    ]
+    ++ optional (jsoncpp == null) "--no-system-jsoncpp"
+    ++ optional useQt4 "--qt-gui";
 
   setupHook = ./setup-hook.sh;
 
@@ -61,13 +60,14 @@ stdenv.mkDerivation rec {
     ''
       source $setupHook
       fixCmakeFiles .
-      substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc}
+      substituteInPlace Modules/Platform/UnixPaths.cmake \
+        --subst-var-by glibc ${stdenv.glibc}
     '';
 
   meta = {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ];
+    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ttuegel ];
   };
 }