kadu-0.10.0

svn path=/nixpkgs/trunk/; revision=29370

2 files changed, 6 insertions, 21 deletions

diff --git a/pkgs/applications/networking/instant-messengers/kadu/config.patch b/pkgs/applications/networking/instant-messengers/kadu/config.patch
deleted file mode 100644
index 263898ba0db10..0000000000000
--- a/pkgs/applications/networking/instant-messengers/kadu/config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/.config b/.config
-index e0068bf..808ebf4 100644
---- a/.config
-+++ b/.config
-@@ -187,8 +187,8 @@ module_history_migration=m
- # PL: Obsługa szyfrowania wiadomości przy pomocy OpenSSLa
- # Platform: Linux, Mac OS X, Windows
- # Needs: libcrypto, libssl
--module_encryption_ng=m
--module_encryption_ng_simlite=m
-+module_encryption_ng=n
-+module_encryption_ng_simlite=n
- 
- # Description: Auto away module
- # PL: Obsługa automatycznej zmiany statusu po określonym czasie bezczynności
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index 9a9298ecdce4b..cdad7eb1e7c46 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -3,15 +3,14 @@
 
 stdenv.mkDerivation {
 
-  name = "kadu-0.9.2";
+  name = "kadu-0.10.0";
 
   src = fetchurl {
-    url = http://www.kadu.net/download/stable/kadu-0.9.2.tar.bz2;
-    sha256 = "05lpx7m2adx8vv4h62rsiwlgay24m6cxdbibg7vzl4xkq9ybv30b";
+    url = http://www.kadu.net/download/stable/kadu-0.10.0.tar.bz2;
+    sha256 = "039dx8y6vzqmv86prk1srmi7fvxlrbisyd6rcfs0gv497bfi1995";
   };
 
-  buildInputs = [
-    cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
+  buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
   ];
 
   configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
@@ -22,7 +21,8 @@ stdenv.mkDerivation {
     patchShebangs .
   '';
 
-  patches = [ ./config.patch ];
+  # because I was not able to get those working
+  patches = [ ./disable_encryption_plugins.patch ];
 
   NIX_LDFLAGS="-lX11";