From a910301e18a97d8d9d8a90ab63f957bf949d1e33 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 22 Mar 2015 17:00:46 -0500 Subject: make cmake-3.2 the default version --- pkgs/development/libraries/jsoncpp/1.6.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/jsoncpp') diff --git a/pkgs/development/libraries/jsoncpp/1.6.nix b/pkgs/development/libraries/jsoncpp/1.6.nix index 69dfc217573..d8b85847975 100644 --- a/pkgs/development/libraries/jsoncpp/1.6.nix +++ b/pkgs/development/libraries/jsoncpp/1.6.nix @@ -11,7 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz"; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = + [ + # cmake can be built with the system jsoncpp, or its own bundled version. + # Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so + # we make a bootstrapping build with the bundled version. + (cmake.override { jsoncpp = null; }) + python + ]; meta = { inherit version; -- cgit 1.4.1