hipchat: Update to 2.2.1107

This commit is contained in:
Eelco Dolstra 2014-05-27 00:48:30 +02:00
parent 4a85312295
commit 481f428604
2 changed files with 72 additions and 38 deletions

View file

@ -1,59 +1,93 @@
{ stdenv { stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib
, fetchurl , mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid
, libtool , libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra, makeWrapper }:
, libXext
, libSM
, libICE
, libX11
, libXft
, libXau
, libXdmcp
, libXrender
, freetype
, fontconfig
, openssl
}:
let let
version = "1.94.407";
version = "2.2.1107";
rpath = stdenv.lib.makeSearchPath "lib" [ rpath = stdenv.lib.makeSearchPath "lib" [
stdenv.glibc stdenv.glibc
stdenv.gcc.gcc
libtool libtool
libXext xlibs.libXext
libSM xlibs.libSM
libICE xlibs.libICE
libX11 xlibs.libX11
libXft xlibs.libXft
libXau xlibs.libXau
libXdmcp xlibs.libXdmcp
libXrender xlibs.libXrender
xlibs.libXfixes
xlibs.libXcomposite
xlibs.libxcb
xlibs.libXi
freetype freetype
fontconfig fontconfig
openssl openssl
]; glib
mesa
gstreamer
gst_plugins_base
dbus
alsaLib
zlib
libuuid
libxml2
libxslt
sqlite
libogg
libvorbis
xz
libcanberra
] + ":${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}";
src = fetchurl { src =
url = "http://downloads.hipchat.com/linux/arch/hipchat-${version}-i686.pkg.tar.xz"; if stdenv.system == "x86_64-linux" then
sha256 = "0kyjpa2ir066zqkvs1zmnx6kvl8v4jfl8h7bw110cgigwmiplk7k"; fetchurl {
}; url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz";
in stdenv.mkDerivation { sha256 = "0lf780pxbh40m2i48cki072lrm75924cz3zgkmaxddmar3y13bwa";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz";
sha256 = "1k33670rpigdpy9jcacryc1i05ykp5yffcplmbm5q29ng54cn0zv";
}
else
throw "HipChat is not supported on ${stdenv.system}";
in
stdenv.mkDerivation {
name = "hipchat-${version}"; name = "hipchat-${version}";
inherit src;
buildInputs = [ makeWrapper ];
buildCommand = '' buildCommand = ''
tar xf ${src} tar xf ${src}
mkdir -p $out
mv opt/HipChat/lib $out d=$out/libexec/hipchat
mv opt/HipChat/bin $out mkdir -p $out/libexec
rm -rfv opt/HipChat/lib/{libstdc++*,libz*,libuuid*,libxml2*,libxslt*,libsqlite*,libogg*,libvorbis*,liblzma*,libcanberra.*,libcanberra-*}
mv opt/HipChat/lib/ $d
mv usr/share $out mv usr/share $out
patchShebangs $out/bin patchShebangs $out/bin
for file in $(find $out/lib -type f); do
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true for file in $(find $d -type f); do
patchelf --set-rpath ${rpath}:$out/lib $file || true patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $file || true
patchelf --set-rpath ${rpath}:\$ORIGIN $file || true
done done
substituteInPlace $out/share/applications/hipchat.desktop \ substituteInPlace $out/share/applications/hipchat.desktop \
--replace /opt/HipChat/bin $out/bin --replace /opt/HipChat/bin $out/bin
makeWrapper $d/hipchat.bin $out/bin/hipchat \
--set HIPCHAT_LD_LIBRARY_PATH '"$LD_LIBRARY_PATH"' \
--set HIPCHAT_QT_PLUGIN_PATH '"$QT_PLUGIN_PATH"'
mv opt/HipChat/bin/linuxbrowserlaunch $out/bin
''; '';
meta = { meta = {

View file

@ -8620,7 +8620,7 @@ let
hexedit = callPackage ../applications/editors/hexedit { }; 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 { }; homebank = callPackage ../applications/office/homebank { };