From 682e4ae09e34e8895e9d24d08b205b2a585ecc1b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 21 Aug 2010 19:29:47 +0000
Subject: [PATCH] Move konversation to pkgs

svn path=/nixpkgs/trunk/; revision=23330
---
 .../networking/irc/konversation/default.nix   | 25 +++++++++++++++++++
 pkgs/desktops/kde-4.4/default.nix             |  7 +-----
 .../extragear/konversation/default.nix        | 16 ------------
 pkgs/top-level/all-packages.nix               |  4 ++-
 4 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/applications/networking/irc/konversation/default.nix
 delete mode 100644 pkgs/desktops/kde-4.4/extragear/konversation/default.nix

diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
new file mode 100644
index 000000000000..938a26fd785b
--- /dev/null
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver
+, kdelibs, kdepimlibs, automoc4, phonon, qca2}:
+
+let
+  pn = "konversation";
+  v = "1.3.1";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pn}-${v}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.bz2";
+    sha256 = "0wigcvi6lscy14dhm5nh1mkhfx7xxdq9g163pwpd0xndvybrfhfl";
+  };
+
+  buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs
+    automoc4 phonon qca2 ];
+
+  meta = with stdenv.lib; {
+    description = "Integrated IRC client for KDE";
+    license = "GPL";
+    inherit (kdelibs.meta) maintainers platforms;
+  };
+}
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index 24db09632e1e..2ad7e5e0cd79 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -296,12 +296,7 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4 phonon qca2;
   };
   
-  konversation = import ./extragear/konversation {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext;
-    inherit (pkgs.xlibs) libXScrnSaver;
-    inherit kdelibs kdepimlibs;
-    inherit automoc4 phonon qca2;
-  };
+  inherit (pkgs) konversation;
   
   gtk_qt_engine = import ./extragear/gtk-qt-engine {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
diff --git a/pkgs/desktops/kde-4.4/extragear/konversation/default.nix b/pkgs/desktops/kde-4.4/extragear/konversation/default.nix
deleted file mode 100644
index b89029333086..000000000000
--- a/pkgs/desktops/kde-4.4/extragear/konversation/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, libXScrnSaver
-, kdelibs, kdepimlibs, automoc4, phonon, qca2}:
-
-stdenv.mkDerivation {
-  name = "konversation-1.3";
-  src = fetchurl {
-    url = mirror://kde/stable/konversation/1.3/src/konversation-1.3.tar.bz2;
-    sha256 = "05gs75j4qza7i7yydy7rcqhp70r6zblbai5k1fygyhsd23ryqq9n";
-  };
-  buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc libXScrnSaver kdelibs kdepimlibs automoc4 phonon qca2 ];
-  meta = {
-    description = "Integrated IRC client for KDE";
-    license = "GPL";
-    maintainers = [ lib.maintainers.sander ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2eacf4c2dba..5b51408fc1e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3252,7 +3252,7 @@ let
     useGTK = getPkgConfig "libiodbc" "gtk" false;
   };
 
-  libktorrent = newScope pkgs.kde45 ../development/libraries/libktorrent { };
+  libktorrent = newScope pkgs.kde4 ../development/libraries/libktorrent { };
 
   liblqr1 = callPackage ../development/libraries/liblqr-1 {
     inherit (gnome) glib;
@@ -5729,6 +5729,8 @@ let
     #  inherit ffmpeg2theora sox, vorbis-tools lame mjpegtools dvdauthor 'Q'dvdauthor growisofs mencoder;
   };
 
+  konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
+
   lame = callPackage ../applications/audio/lame { };
 
   larswm = callPackage ../applications/window-managers/larswm { };