From a581f4ca56cac8fd73e483ba9f5f876f9da8f8d1 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Mon, 22 Aug 2016 20:35:34 +0200 Subject: [PATCH] kdevplatform: Fix build. Build log: https://hydra.nixos.org/build/38445107/nixlog/1 Upstream report and patch: https://phabricator.kde.org/D1160 --- pkgs/development/libraries/kdevplatform/default.nix | 5 ++++- .../libraries/kdevplatform/dependency.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/kdevplatform/dependency.patch diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index d2b9581462b..549be9a71f5 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b"; }; - patches = [ ./gettext.patch ]; + patches = [ + ./gettext.patch # build error caused by CMake update + ./dependency.patch # build error: https://phabricator.kde.org/D1160 + ]; propagatedBuildInputs = [ kdelibs qt4 phonon ]; buildInputs = [ apr aprutil subversion boost qjson grantlee ]; diff --git a/pkgs/development/libraries/kdevplatform/dependency.patch b/pkgs/development/libraries/kdevplatform/dependency.patch new file mode 100644 index 00000000000..3205b4cab67 --- /dev/null +++ b/pkgs/development/libraries/kdevplatform/dependency.patch @@ -0,0 +1,12 @@ +diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt +--- a/plugins/filetemplates/CMakeLists.txt ++++ b/plugins/filetemplates/CMakeLists.txt +@@ -81,6 +81,7 @@ + ) + + kde4_add_executable(testfiletemplates ${test_srcs}) ++add_dependencies(testfiletemplates kdevfiletemplates) + + target_link_libraries(testfiletemplates + ${KDE4_KDECORE_LIBS} +