From 63bf8c3a0d3ed5ac26a2c4b24ef1bcc694fdef53 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 2 Apr 2012 09:59:25 +0000 Subject: [PATCH] * Support the 32-bit version of the Google Talk plugin. svn path=/nixpkgs/trunk/; revision=33533 --- .../mozilla-plugins/google-talk-plugin/default.nix | 8 ++++++-- .../browsers/mozilla-plugins/google-talk-plugin/preload.c | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index b8cb5b11a6b..01f4fb901fd 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -48,8 +48,12 @@ stdenv.mkDerivation { url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; sha256 = "15909wnhspjci0fspvh5j87v1xl7dfix36zrpvk6fpc3m0vys0nh"; } - else - throw "Google Talk does not support your platform."; + else if stdenv.system == "i686-linux" then + fetchurl { + url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm"; + sha256 = "0sclsj6mcaynkw28kipgmcj6sx5vbyrz1rwwyx89ll48n46k65ya"; + } + else throw "Google Talk does not support your platform."; buildInputs = [ rpm cpio ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c index 2ebcc2a40b1..9c543fed758 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c @@ -25,7 +25,6 @@ const char * rewrite(const char * path, char * buf) int execvp(const char * path, char * const argv[]) { - fprintf(stderr, "foo %s\n", path); int (*_execvp) (const char *, char * const argv[]) = dlsym(RTLD_NEXT, "execvp"); char buf[PATH_MAX]; return _execvp(rewrite(path, buf), argv);