JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Support the 32-bit version of the Google Talk plugin.

Browse Source 
svn path=/nixpkgs/trunk/; revision=33533
This commit is contained in:
Eelco Dolstra 2012-04-02 09:59:25 +00:00
parent d8e8730127
commit 63bf8c3a0d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
View File

@ -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 ];

1
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
View File

@ -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);