diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-31 16:30:51 +0100 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-31 16:30:51 +0100 |
| commit | 54288f5cfe4e48779d7c08abefa8cbb23d58e58a (patch) | |
| tree | 2af834efcb246cd607a692937266d5bb753317b4 /pkgs/applications | |
| parent | 62e78f6b23a9dd77411e8ffd5adcf6bd1083cd50 (diff) | |
| download | nixpkgs-54288f5cfe4e48779d7c08abefa8cbb23d58e58a.tar nixpkgs-54288f5cfe4e48779d7c08abefa8cbb23d58e58a.tar.gz nixpkgs-54288f5cfe4e48779d7c08abefa8cbb23d58e58a.tar.bz2 nixpkgs-54288f5cfe4e48779d7c08abefa8cbb23d58e58a.tar.lz nixpkgs-54288f5cfe4e48779d7c08abefa8cbb23d58e58a.tar.xz nixpkgs-54288f5cfe4e48779d7c08abefa8cbb23d58e58a.tar.zst nixpkgs-54288f5cfe4e48779d7c08abefa8cbb23d58e58a.zip | |
Update hipchat
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/hipchat/default.nix | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index c0f76602b2b..c7ea2d135d5 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,21 +1,12 @@ -{ stdenv -, fetchurl -, libtool -, libXext -, libSM -, libICE -, libX11 -, libXft -, libXau -, libXdmcp -, libXrender -, freetype -, fontconfig -, openssl +{ stdenv, fetchurl, libtool, libXext, libSM, libICE, libX11, libXft, libXau, libXdmcp, libXrender +, libxcb, libXfixes, libXcomposite, libXi, dbus, freetype, fontconfig, openssl, zlib, mesa +, libxslt, libxml2 }: +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 { - url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz"; - sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k"; - }; + src = + if stdenv.system == "i686-linux" then fetchurl { + 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-rpath ${rpath}:$out/lib $file || true + patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $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 |