Merge pull request #96 from aszlig/google-talkplugin

google-talk-plugin: Prefer Debian package.

+12 -12
+12 -12
pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
··· 7 8 let 9 10 rpathPlugin = makeLibraryPath 11 [ mesa 12 xorg.libXt ··· 39 40 in 41 42 - stdenv.mkDerivation { 43 - name = "google-talk-plugin-3.2.4.0"; 44 45 src = 46 if stdenv.system == "x86_64-linux" then 47 fetchurl { 48 - url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm"; 49 - sha256 = "0gf1bsd52pa47h53x5n1ljn07xc23pzvdc7q3lbqy12zf9szqq2c"; 50 } 51 else if stdenv.system == "i686-linux" then 52 fetchurl { 53 - url = "http://dl.google.com/linux/direct/google-talkplugin_current_i386.rpm"; 54 - sha256 = "055572zi1j3w16lj4cdk686abyhz1xd43445bwk6v38qr4f188dd"; 55 } 56 else throw "Google Talk does not support your platform."; 57 58 - buildInputs = [ rpm cpio ]; 59 - 60 - unpackPhase = 61 - '' 62 - rpm2cpio $src | cpio -i --make-directories -v 63 - ''; 64 65 installPhase = 66 ''
··· 7 8 let 9 10 + baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; 11 + 12 rpathPlugin = makeLibraryPath 13 [ mesa 14 xorg.libXt ··· 41 42 in 43 44 + stdenv.mkDerivation rec { 45 + name = "google-talk-plugin-${version}"; 46 + version = "3.2.4.0"; 47 48 src = 49 if stdenv.system == "x86_64-linux" then 50 fetchurl { 51 + url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; 52 + sha256 = "0hd8iyv092fr4bz760xjawiad581hphddv608d0dvzy2bhnl17g1"; 53 } 54 else if stdenv.system == "i686-linux" then 55 fetchurl { 56 + url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; 57 + sha256 = "13vqs4k16a6bzc5i4zpnakh31nkdqp7m9cv7p16r1sq5smv1331i"; 58 } 59 else throw "Google Talk does not support your platform."; 60 61 + unpackPhase = '' 62 + ar p "$src" data.tar.gz | tar xz 63 + ''; 64 65 installPhase = 66 ''