Author: eelco
Date: Mon Apr 2 09:59:25 2012
New Revision: 33533
URL: https://nixos.org/websvn/nix/?rev=33533&sc=1
Log:
* Support the 32-bit version of the Google Talk plugin.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
Sun Apr 1 22:46:15 2012 (r33532)
+++
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
Mon Apr 2 09:59:25 2012 (r33533)
@@ -48,8 +48,12 @@
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 ];
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
==============================================================================
---
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
Sun Apr 1 22:46:15 2012 (r33532)
+++
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
Mon Apr 2 09:59:25 2012 (r33533)
@@ -25,7 +25,6 @@
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);
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
