Merge pull request #32927 from peterhoeg/u/kdeapp

kde-applications: 17.08.3 -> 17.12.0

3 files changed, 0 insertions, 92 deletions

diff --git a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
deleted file mode 100644
index bb2d2d39d25a..000000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index d5595fc85aff..000000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ 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 ];
-  };
-}
diff --git a/pkgs/applications/networking/kget/default.nix b/pkgs/applications/networking/kget/default.nix
deleted file mode 100644
index 0dc37d10d1ae..000000000000
--- a/pkgs/applications/networking/kget/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  mkDerivation, lib, fetchFromGitHub,
-  extra-cmake-modules, kdoctools, makeWrapper,
-  kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme,
-  kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui
-}:
-
-let
-  pname = "kget";
-  version = "20170903";
-
-in mkDerivation {
-  name = "${pname}-${version}";
-  src = fetchFromGitHub {
-    owner  = "KDE";
-    repo   = pname;
-    rev    = "739c0b399faf5a393c7436c0771662596b840fdc";
-    sha256 = "0rn6a4xd9zmf9sdjd5b4rh8yky6qm6ffjgjpn4snkdjsn6vm6y43";
-  };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
-
-  buildInputs = [
-    kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme
-    kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}