From a17535822a68582d04c8b49d1ecf53c4ccaa5b91 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 21 Mar 2015 12:33:31 -0500
Subject: [PATCH] kf57: use cmake-3.2
Build was broken by openssl update because older cmake could not parse
openssl's version correctly.
---
pkgs/development/libraries/kde-frameworks-5.7/default.nix | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix
index c7fdbc060ec..793f1e9111d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix
@@ -72,8 +72,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;
@@ -105,7 +106,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 =
[