2 files changed, 17 insertions, 16 deletions
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index e136670a5892f..f207eaed7037e 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -1,14 +1,17 @@
-{ fetchurl, stdenv, gnutls, glib, pkgconfig }:
+{ fetchurl, stdenv, gnutls, glib, pkgconfig, check }:
 
 stdenv.mkDerivation rec {
-  name = "bitlbee-1.2.4";
+  name = "bitlbee-1.2.8";
 
   src = fetchurl {
-    url = "mirror://bitlbee/src/" + name + ".tar.gz";
-    sha256 = "1lwcjh1r81xqf6fxjwd2a2hv8dq9g0iyc8dnbr1pgas4vmjg9xf2";
+    url = "mirror://bitlbee/src/${name}.tar.gz";
+    sha256 = "11lfxvra46mwcnlxvhnywv6xbp7zl3h27hsbfwdh16b6fy41n1is";
   };
 
-  buildInputs = [ gnutls glib pkgconfig ];
+  buildInputs = [ gnutls glib pkgconfig ]
+    ++ stdenv.lib.optional doCheck check;
+
+  doCheck = true;
 
   meta = {
     description = "BitlBee, an IRC to other chat networks gateway";
@@ -26,5 +29,8 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.bitlbee.org/;
     license = "GPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix
index a9b5e0d7a864c..c35d71fbca0a9 100644
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, cmake, qt, libgadu, bash, libXScrnSaver, libsndfile, qca2, wget, libX11, alsaLib }:
+{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, qca2
+, libX11, alsaLib }:
 
 stdenv.mkDerivation {
 
@@ -10,19 +11,13 @@ stdenv.mkDerivation {
   };
   
   buildInputs = [
-    cmake qt libgadu bash libXScrnSaver libsndfile qca2 wget libX11 alsaLib
+    cmake qt4 libgadu libXScrnSaver libsndfile qca2 libX11 alsaLib
   ];
 
-  cmakeFlags = "-Wno-dev";
+  cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF";
 
-  NIX_LDFLAGS="-lX11";
-
-  patches = [ ./more-icons.patch ];
-
-  patchPhase = ''
-    unset patchPhase; patchPhase
-    sed 's=/bin/bash=/${stdenv.shell}=g' -i \
-      `find -type f -name '*.sh' -or -name 'autodownload'`
+  prePatch = ''
+    patchShebangs .
   '';
 
   meta = {