diff options
| author | Petr Rockai <me@mornfall.net> | 2014-02-15 10:24:22 +0100 |
|---|---|---|
| committer | Petr Rockai <me@mornfall.net> | 2014-02-15 10:27:39 +0100 |
| commit | 38c59c97b332b5c52f0b1cd656dcb15d5c474f97 (patch) | |
| tree | 0405a52b745ed6de1572e6591fcb3a038eef7b80 /pkgs/applications | |
| parent | d2758ce017c569d0146a5aa5e1ebf4dacb5292ee (diff) | |
| download | nixpkgs-38c59c97b332b5c52f0b1cd656dcb15d5c474f97.tar nixpkgs-38c59c97b332b5c52f0b1cd656dcb15d5c474f97.tar.gz nixpkgs-38c59c97b332b5c52f0b1cd656dcb15d5c474f97.tar.bz2 nixpkgs-38c59c97b332b5c52f0b1cd656dcb15d5c474f97.tar.lz nixpkgs-38c59c97b332b5c52f0b1cd656dcb15d5c474f97.tar.xz nixpkgs-38c59c97b332b5c52f0b1cd656dcb15d5c474f97.tar.zst nixpkgs-38c59c97b332b5c52f0b1cd656dcb15d5c474f97.zip | |
kadu: Fix build with current cmake.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/kadu/cmake.patch | 13 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/kadu/default.nix | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch new file mode 100644 index 00000000000..bb2d2d39d25 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch @@ -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~ diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 03cbb1ce073..4e176ec56dc 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation { sed -i -e '/mpd_mediaplayer/d' \ -e '/encryption_ng/d' \ -e '/encryption_ng_simlite/d' Plugins.cmake + patch -p1 < ${./cmake.patch} ''; NIX_LDFLAGS="-lX11"; |