diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-02-10 17:34:35 +0100 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-02-10 17:34:35 +0100 |
| commit | e9a894a97ddee892fe85a87851424a202198508d (patch) | |
| tree | 3cf8e4e18e4130c008d5d85d56f2aa2929be0bd9 /pkgs/applications/networking/instant-messengers/hipchat | |
| parent | 00b1461e4fdf968948491930aed4ec79a79b1100 (diff) | |
| download | nixpkgs-e9a894a97ddee892fe85a87851424a202198508d.tar nixpkgs-e9a894a97ddee892fe85a87851424a202198508d.tar.gz nixpkgs-e9a894a97ddee892fe85a87851424a202198508d.tar.bz2 nixpkgs-e9a894a97ddee892fe85a87851424a202198508d.tar.lz nixpkgs-e9a894a97ddee892fe85a87851424a202198508d.tar.xz nixpkgs-e9a894a97ddee892fe85a87851424a202198508d.tar.zst nixpkgs-e9a894a97ddee892fe85a87851424a202198508d.zip | |
Revert "Update hipchat"
This reverts commit 54288f5cfe4e48779d7c08abefa8cbb23d58e58a.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/hipchat')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/hipchat/default.nix | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index c7ea2d135d5..c0f76602b2b 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,12 +1,21 @@ -{ stdenv, fetchurl, libtool, libXext, libSM, libICE, libX11, libXft, libXau, libXdmcp, libXrender -, libxcb, libXfixes, libXcomposite, libXi, dbus, freetype, fontconfig, openssl, zlib, mesa -, libxslt, libxml2 +{ stdenv +, fetchurl +, libtool +, libXext +, libSM +, libICE +, libX11 +, libXft +, libXau +, libXdmcp +, libXrender +, freetype +, fontconfig +, openssl }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - let - version = "2.1.982"; + version = "1.94.407"; rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc @@ -20,29 +29,15 @@ let libXau libXdmcp libXrender - libxcb - libXfixes - libXcomposite - libXi - dbus freetype fontconfig openssl - zlib - mesa - libxslt - libxml2 ]; - 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"; - }; - + src = fetchurl { + url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz"; + sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k"; + }; in stdenv.mkDerivation { name = "hipchat-${version}"; @@ -54,8 +49,8 @@ in stdenv.mkDerivation { mv usr/share $out patchShebangs $out/bin for file in $(find $out/lib -type f); do - 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 + patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true + patchelf --set-rpath ${rpath}:$out/lib $file || true done substituteInPlace $out/share/applications/hipchat.desktop \ --replace /opt/HipChat/bin $out/bin |