* Support the 32-bit version of the Google Talk plugin.
svn path=/nixpkgs/trunk/; revision=33533
This commit is contained in:
parent
d8e8730127
commit
63bf8c3a0d
|
@ -48,8 +48,12 @@ stdenv.mkDerivation {
|
||||||
url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm";
|
url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm";
|
||||||
sha256 = "15909wnhspjci0fspvh5j87v1xl7dfix36zrpvk6fpc3m0vys0nh";
|
sha256 = "15909wnhspjci0fspvh5j87v1xl7dfix36zrpvk6fpc3m0vys0nh";
|
||||||
}
|
}
|
||||||
else
|
else if stdenv.system == "i686-linux" then
|
||||||
throw "Google Talk does not support your platform.";
|
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 ];
|
buildInputs = [ rpm cpio ];
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,6 @@ const char * rewrite(const char * path, char * buf)
|
||||||
|
|
||||||
int execvp(const char * path, char * const argv[])
|
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");
|
int (*_execvp) (const char *, char * const argv[]) = dlsym(RTLD_NEXT, "execvp");
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
return _execvp(rewrite(path, buf), argv);
|
return _execvp(rewrite(path, buf), argv);
|
||||||
|
|
Loading…
Reference in a new issue