From e8932ddcefb15f1d9b20b9171b2753e1e32ace14 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sun, 5 Apr 2015 14:20:38 +0200 Subject: [PATCH] kf58: use cmake-3.2 This is the same as a17535822a68582d04c8b49d1ecf53c4ccaa5b91. --- pkgs/development/libraries/kde-frameworks-5.8/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks-5.8/default.nix b/pkgs/development/libraries/kde-frameworks-5.8/default.nix index c050baf33cbc..6a30fd5d6f18 100644 --- a/pkgs/development/libraries/kde-frameworks-5.8/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.8/default.nix @@ -69,8 +69,9 @@ let # packages from the nixpkgs collection (with pkgs; { - inherit cmake epoxy; Boost = boost155; + cmake = cmake-3_2; + inherit epoxy; GIF = giflib; GLIB2 = glib; Gpgme = gpgme; @@ -102,7 +103,7 @@ let extra-cmake-modules = { inherit (super.extra-cmake-modules) name src; - propagatedNativeBuildInputs = [ pkgs.cmake pkgs.pkgconfig qt5.tools ]; + propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ]; cmakeFlags = ["-DBUILD_TESTING=OFF"]; patches = [