From 1640e4263b3bce309ac12387d8a1e4cd842fea7a Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 20 Nov 2015 10:29:42 +0100 Subject: kde4: use cmake-2.8 instead of default, /cc #11097 This fixes kgamma breakage after cmake-3.4 update, and prevents future rot. --- pkgs/desktops/kde-4.14/kde-package/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/desktops/kde-4.14') diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix index 52600e183bdd..bbb540ec10fc 100644 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ b/pkgs/desktops/kde-4.14/kde-package/default.nix @@ -1,10 +1,11 @@ -{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4, perl, pkgconfig +{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake-2_8, automoc4, perl, pkgconfig , release, branch, ignoreList, extraSubpkgs }: let inherit (stdenv.lib) filter fold; inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head; + cmake = cmake-2_8; in rec { manifest = import (./. + "/${release}.nix"); -- cgit 1.4.1