Update hipchat

pkgs/applications/networking/instant-messengers/hipchat/default.nix

@@ -1,21 +1,12 @@
-{ stdenv
+{ stdenv, fetchurl, libtool, libXext, libSM, libICE, libX11, libXft, libXau, libXdmcp, libXrender
-, fetchurl
+, libxcb, libXfixes, libXcomposite, libXi, dbus, freetype, fontconfig, openssl, zlib, mesa
-, libtool
+, libxslt, libxml2
-, libXext
-, libSM
-, libICE
-, libX11
-, libXft
-, libXau
-, libXdmcp
-, libXrender
-, freetype
-, fontconfig
-, openssl
 }:
 
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; 
+
 let
-  version = "1.94.407";
+  version = "2.1.982";
 
   rpath = stdenv.lib.makeSearchPath "lib" [
     stdenv.glibc
@@ -29,15 +20,29 @@ let
     libXau
     libXdmcp
     libXrender
+    libxcb
+    libXfixes
+    libXcomposite
+    libXi
+    dbus
     freetype
     fontconfig
     openssl
+    zlib
+    mesa
+    libxslt
+    libxml2
   ];
 
-  src = fetchurl {
+  src = 
-    url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz";
+    if stdenv.system == "i686-linux" then fetchurl {
-    sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k";
+      url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz";
+      sha256 = "1i60fkl5hdx2p2yfsx9w8qkzn6hl8fajvfls0r0gc2bqc9whg6vn";
+    } else fetchurl {
+      url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz";
+      sha256 = "12bn4la9z1grkbcnixjwhadgxa2g6qkd5x7r3l3vn1sdalgal4ks";
     };
+
 in stdenv.mkDerivation {
   name = "hipchat-${version}";
 
@@ -49,8 +54,8 @@ in stdenv.mkDerivation {
     mv usr/share $out
     patchShebangs $out/bin
     for file in $(find $out/lib -type f); do
-        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true
+        patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $file || true
-        patchelf --set-rpath ${rpath}:$out/lib $file || true
+        patchelf --set-rpath ${rpath}:${stdenv.lib.optionalString stdenv.is64bit "${stdenv.gcc.gcc}/lib64:"}$out/lib $file || true
     done
     substituteInPlace $out/share/applications/hipchat.desktop \
       --replace /opt/HipChat/bin $out/bin

pkgs/top-level/all-packages.nix

@@ -8068,7 +8068,7 @@ let
 
   hexedit = callPackage ../applications/editors/hexedit { };
 
-  hipchat = callPackage_i686 ../applications/networking/instant-messengers/hipchat { };
+  hipchat = callPackage ../applications/networking/instant-messengers/hipchat { };
 
   homebank = callPackage ../applications/office/homebank { };