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

kadu: Fix build with current cmake.

Browse Source
This commit is contained in:
Petr Rockai 2014-02-15 10:24:22 +01:00
parent d2758ce017
commit 38c59c97b3
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/instant-messengers/kadu/cmake.patch Normal file
View File

@ -0,0 +1,13 @@
diff -ru kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt
--- kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2012-08-30 16:13:17.000000000 +0200
+++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt 2014-02-15 10:20:33.368716013 +0100
@@ -26,7 +26,7 @@
get_filename_component (_basename ${_current_MOC} NAME_WE)
set (_header ${_abs_FILE})
set (_moc ${_abs_PATH}/${_current_MOC})
- QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
+ QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "")
MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
endforeach (_current_MOC_INC)
endif (_match)
Only in kadu-0.12.2/plugins/jabber_protocol/3rdparty: CMakeLists.txt~

1
pkgs/applications/networking/instant-messengers/kadu/default.nix
View File

@ -26,6 +26,7 @@ stdenv.mkDerivation {
sed -i -e '/mpd_mediaplayer/d' \ sed -i -e '/mpd_mediaplayer/d' \
-e '/encryption_ng/d' \ -e '/encryption_ng/d' \
-e '/encryption_ng_simlite/d' Plugins.cmake -e '/encryption_ng_simlite/d' Plugins.cmake
patch -p1 < ${./cmake.patch}
''; '';
NIX_LDFLAGS="-lX11"; NIX_LDFLAGS="-lX11";