diff options
| author | Domen Kožar <domen@dev.si> | 2014-12-07 14:02:48 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-12-07 14:02:48 +0100 |
| commit | 4aa3eec330f64afd9db78b9bb26db32bdbabe2c4 (patch) | |
| tree | 90cb19f6cfb8498dff0597a7ae2968b240b1e559 /pkgs/applications/networking/instant-messengers/hipchat | |
| parent | 43c4d78bc6e19476c122efc82316122722e988aa (diff) | |
| parent | ad4ad11fbc8871811d65d0b2427fd4bc38e54a14 (diff) | |
| download | nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.gz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.bz2 nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.lz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.xz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.zst nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.zip | |
Merge branch 'master' into staging
Conflicts: pkgs/development/libraries/fontconfig/default.nix
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/hipchat')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/hipchat/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 22e8a97466b3..5206db497b83 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -5,7 +5,7 @@ let - version = "2.2.1163"; + version = "2.2.1287"; rpath = stdenv.lib.makeSearchPath "lib" [ stdenv.glibc @@ -47,12 +47,12 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz"; - sha256 = "0yafin8qfnv9kj61z9vxza42r7fv8b9j04qs50masbly0jg5xsg8"; + sha256 = "170izy3v18rgriz84h4gyf9354jvjrsbkgg53czq9l0scyz8x55b"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz"; - sha256 = "1a0yvrnp41s53wpqv2jxsb3gd4vb49nfh89m6nwbw4qd85i5lfsp"; + sha256 = "150q7pxg5vs14is5qf36yfsf7r70g49q9xr1d1rknmc5m4qa5rc5"; } else throw "HipChat is not supported on ${stdenv.system}"; @@ -75,8 +75,6 @@ stdenv.mkDerivation { mv opt/HipChat/lib/ $d mv usr/share $out - patchShebangs $out/bin - for file in $(find $d -type f); do patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $file || true patchelf --set-rpath ${rpath}:\$ORIGIN $file || true |