From 295439bb0a6dd644bff830a7af6cb56f40b8f072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> Date: Tue, 22 Sep 2015 07:58:28 +0200 Subject: [PATCH] kdevplatform: fix #9981 - build after svn update Also enableParallelBuilding. --- .../libraries/kdevplatform/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 8b7d73462c24..f2b7da798fcb 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon, +{ stdenv, fetchurl, fetchpatch, cmake, kdelibs, subversion, qt4, automoc4, phonon, gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }: stdenv.mkDerivation rec { @@ -9,14 +9,22 @@ stdenv.mkDerivation rec { sha256 = "dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac"; }; + patches = [(fetchpatch { + name = "svn-1.9.patch"; + url = "https://git.reviewboard.kde.org/r/124783/diff/raw/"; + sha256 = "1ixll5pvynb3l4znc65d82a5bj2s3c7c7is585s2wdpfzjgl5ay0"; + })]; + propagatedBuildInputs = [ kdelibs qt4 phonon ]; buildInputs = [ apr aprutil subversion boost qjson grantlee ]; nativeBuildInputs = [ cmake automoc4 gettext pkgconfig ]; - meta = { - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + maintainers = [ maintainers.urkud ]; + platforms = platforms.linux; description = "KDE libraries for IDE-like programs"; longDescription = '' A free, opensource set of libraries that can be used as a foundation for