public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kdevplatform: Fix build.

Browse Source 
Build log: https://hydra.nixos.org/build/38445107/nixlog/1
Upstream report and patch: https://phabricator.kde.org/D1160
This commit is contained in:
Ambroz Bizjak 2016-08-22 20:35:34 +02:00
parent d559c07bbe
commit a581f4ca56
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/kdevplatform/default.nix
View File

@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b"; 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 ]; propagatedBuildInputs = [ kdelibs qt4 phonon ];
buildInputs = [ apr aprutil subversion boost qjson grantlee ]; buildInputs = [ apr aprutil subversion boost qjson grantlee ];

12
pkgs/development/libraries/kdevplatform/dependency.patch Normal file
View File

@ -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}