Commit 6236dd8e authored by gnidorah's avatar gnidorah
Browse files

kadu-kde4: drop

parent a4c0c4a9
Loading
Loading
Loading
Loading
+0 −13
Original line number Diff line number Diff line
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~
+0 −46
Original line number Diff line number Diff line
{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11,
  alsaLib, aspell, libidn, qca2, phonon, pkgconfig }:

stdenv.mkDerivation {

  name = "kadu-0.12.3";

  src = fetchurl {
    url = http://download.kadu.im/stable/kadu-0.12.3.tar.bz2;
    sha256 = "1a5q5b8pm253cwg6ahahjdm8jxj0pv41apyi1nvvy08bs38bn1yn";
  };

  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
  ];

  configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";

  preConfigure = ''
    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig"
  '';

  cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS'";

  prePatch = ''
    patchShebangs .
  '';

  # Disable the kadu plugins I wasn't able to get to work
  patchPhase = ''
    sed -i -e '/mpd_mediaplayer/d' \
           -e '/encryption_ng/d'   \
           -e '/encryption_ng_simlite/d' Plugins.cmake
    patch -p1 < ${./cmake.patch}
  '';

  NIX_LDFLAGS="-lX11";

  meta = {
    description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)";
    homepage = http://www.kadu.net/w/English:Main_Page;
    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.linux;
    maintainers = [ stdenv.lib.maintainers.piotr ];
  };
}
+0 −2
Original line number Diff line number Diff line
@@ -15524,8 +15524,6 @@ with pkgs;
  k9copy = libsForQt5.callPackage ../applications/video/k9copy {};
  kadu = kde4.callPackage ../applications/networking/instant-messengers/kadu { };
  kanboard = callPackage ../applications/misc/kanboard { };
  kdeApplications =