diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2012-08-10 22:58:04 -0700 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2012-08-10 22:58:04 -0700 |
| commit | eaeb0a41b64439de6b11e3c2b2a7602a50d0ca71 (patch) | |
| tree | 87f6bd94c18536a48c626a2089efa68bc084a62e /pkgs | |
| parent | e69a6c57bc6d2d271267e39b02b49f44cfdf7887 (diff) | |
| parent | cb9b55a197bc4065f7d8b11520d2df4385c45d4b (diff) | |
| download | nixlib-eaeb0a41b64439de6b11e3c2b2a7602a50d0ca71.tar nixlib-eaeb0a41b64439de6b11e3c2b2a7602a50d0ca71.tar.gz nixlib-eaeb0a41b64439de6b11e3c2b2a7602a50d0ca71.tar.bz2 nixlib-eaeb0a41b64439de6b11e3c2b2a7602a50d0ca71.tar.lz nixlib-eaeb0a41b64439de6b11e3c2b2a7602a50d0ca71.tar.xz nixlib-eaeb0a41b64439de6b11e3c2b2a7602a50d0ca71.tar.zst nixlib-eaeb0a41b64439de6b11e3c2b2a7602a50d0ca71.zip | |
Merge pull request #96 from aszlig/google-talkplugin
google-talk-plugin: Prefer Debian package.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix | 24 |
1 files changed, 12 insertions, 12 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 addba712153b..ff199791bba8 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 @@ -7,6 +7,8 @@ with stdenv.lib; let + baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; + rpathPlugin = makeLibraryPath [ mesa xorg.libXt @@ -39,28 +41,26 @@ let in -stdenv.mkDerivation { - name = "google-talk-plugin-3.2.4.0"; +stdenv.mkDerivation rec { + name = "google-talk-plugin-${version}"; + version = "3.2.4.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; - sha256 = "0gf1bsd52pa47h53x5n1ljn07xc23pzvdc7q3lbqy12zf9szqq2c"; + url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; + sha256 = "0hd8iyv092fr4bz760xjawiad581hphddv608d0dvzy2bhnl17g1"; } else if stdenv.system == "i686-linux" then fetchurl { - url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm"; - sha256 = "055572zi1j3w16lj4cdk686abyhz1xd43445bwk6v38qr4f188dd"; + url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; + sha256 = "13vqs4k16a6bzc5i4zpnakh31nkdqp7m9cv7p16r1sq5smv1331i"; } else throw "Google Talk does not support your platform."; - buildInputs = [ rpm cpio ]; - - unpackPhase = - '' - rpm2cpio $src | cpio -i --make-directories -v - ''; + unpackPhase = '' + ar p "$src" data.tar.gz | tar xz + ''; installPhase = '' |