about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/kadu
diff options
context:
space:
mode:
authorPiotr Pietraszkiewicz <ppietrasa@googlemail.com>2011-12-06 19:11:15 +0000
committerPiotr Pietraszkiewicz <ppietrasa@googlemail.com>2011-12-06 19:11:15 +0000
commit6cb70eea88cfa7f15c17804e1891798316a0de78 (patch)
treef14cf772813cea6d650e820f848c6413d59af2f8 /pkgs/applications/networking/instant-messengers/kadu
parent621963488f6aac381e367b6e3ac953da6332ec2f (diff)
upgraded to kadu-0.10.1
svn path=/nixpkgs/trunk/; revision=30781
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/kadu')
-rw-r--r--pkgs/applications/networking/instant-messengers/kadu/default.nix8
-rw-r--r--pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch16
-rw-r--r--pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch28
3 files changed, 32 insertions, 20 deletions
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index cdad7eb1e7c46..76b5dde0e8768 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation {
 
-  name = "kadu-0.10.0";
+  name = "kadu-0.10.1";
 
   src = fetchurl {
-    url = http://www.kadu.net/download/stable/kadu-0.10.0.tar.bz2;
-    sha256 = "039dx8y6vzqmv86prk1srmi7fvxlrbisyd6rcfs0gv497bfi1995";
+    url = http://download.kadu.im/stable/kadu-0.10.1.tar.bz2;
+    sha256 = "0j88pyp2nqpc57j38zr135ypfiv4v329gfgiz9rdbqi8j26cyp7g";
   };
 
   buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   '';
 
   # because I was not able to get those working
-  patches = [ ./disable_encryption_plugins.patch ];
+  patches = [ ./disable_some_plugins.patch ];
 
   NIX_LDFLAGS="-lX11";
 
diff --git a/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch b/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch
deleted file mode 100644
index e89095de55d19..0000000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Plugins.cmake b/Plugins.cmake
-index c6906ce..b1284d6 100644
---- a/Plugins.cmake
-+++ b/Plugins.cmake
-@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS
- 
- # encryption
- 	# Encrypted chat support
--	encryption_ng
-+	# encryption_ng
- 	# OpenSSL encrypted chat support
--	encryption_ng_simlite
-+	# encryption_ng_simlite
- 
- # docking
- 	# Tray icon support (common part of all docking modules)
diff --git a/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch b/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch
new file mode 100644
index 0000000000000..0ee06c21382a8
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch
@@ -0,0 +1,28 @@
+diff --git a/Plugins.cmake b/Plugins.cmake
+index ad63f20..c14a781 100644
+--- a/Plugins.cmake
++++ b/Plugins.cmake
+@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS
+ 
+ # encryption
+ 	# Encrypted chat support
+-	encryption_ng
++        # encryption_ng
+ 	# OpenSSL encrypted chat support
+-	encryption_ng_simlite
++        # encryption_ng_simlite
+ 
+ # docking
+ 	# Tray icon support (common part of all docking modules)
+@@ -104,9 +104,9 @@ if (UNIX)
+ 
+ 	# mediaplayer
+ 		# MPD mediaplayer support
+-		mpd_mediaplayer
++		# mpd_mediaplayer
+ 		# MPRIS Media Players support
+-		mprisplayer_mediaplayer
++                # mprisplayer_mediaplayer
+ 	)
+ endif (UNIX)
+