Merge pull request #3213 from wmertens/google-hangouts

Google hangouts: Bump to 5.4.2.0
This commit is contained in:
Michael Raskin 2014-09-03 15:35:18 +04:00
commit dae0d770fc

View File

@ -13,6 +13,7 @@ let
[ mesa [ mesa
xorg.libXt xorg.libXt
xorg.libX11 xorg.libX11
xorg.libXrender
cairo cairo
libpng libpng
gtk gtk
@ -47,20 +48,20 @@ stdenv.mkDerivation rec {
name = "google-talk-plugin-${version}"; name = "google-talk-plugin-${version}";
# You can get the upstream version and SHA-1 hash from the following URLs: # You can get the upstream version and SHA-1 hash from the following URLs:
# http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1'
# http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages | grep -E 'Version|SHA1'
version = "5.1.5.0"; version = "5.4.2.0";
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
sha1 = "fc830f4c7f5816f4578ec73e6d4aef059ad4a0b1"; sha1 = "d75fad757750b4830c4e401ade92b4993e2a4ab2";
} }
else if stdenv.system == "i686-linux" then else if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
sha1 = "9b7043c3585b3479ba11aabb7b8af755a61df963"; sha1 = "410872377b0bdac06b580c5e1755a3a3c712144b";
} }
else throw "Google Talk does not support your platform."; else throw "Google Talk does not support your platform.";
@ -72,22 +73,18 @@ stdenv.mkDerivation rec {
'' ''
plugins=$out/lib/mozilla/plugins plugins=$out/lib/mozilla/plugins
mkdir -p $plugins mkdir -p $plugins
cp opt/google/talkplugin/libnp*.so $plugins cp opt/google/talkplugin/*.so $plugins
patchelf --set-rpath "${makeLibraryPath [ stdenv.gcc.gcc xorg.libX11 ]}:${stdenv.gcc.gcc}/lib64" \ for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do
$plugins/libnpgoogletalk.so patchelf --set-rpath "${makeLibraryPath [ stdenv.gcc.gcc xorg.libX11 ]}:${stdenv.gcc.gcc}/lib64" $plugins/$i
done
patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.gcc.gcc}/lib64" \ for i in libgoogletalkremoting.so libnpo1d.so; do
$plugins/libnpgtpo3dautoplugin.so patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.gcc.gcc}/lib64" $plugins/$i
done
mkdir -p $out/libexec/google/talkplugin mkdir -p $out/libexec/google/talkplugin
cp -prd opt/google/talkplugin/{GoogleTalkPlugin,locale,windowpicker.glade} $out/libexec/google/talkplugin/ cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/
mkdir -p $out/libexec/google/talkplugin/lib
cp opt/google/talkplugin/lib/libCg* $out/libexec/google/talkplugin/lib/
patchelf --set-rpath "$out/libexec/google/talkplugin/lib" \
$out/libexec/google/talkplugin/lib/libCgGL.so
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \