summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2007-12-30 22:19:07 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2007-12-30 22:19:07 +0000
commita98161a0da8825541d0c8b8dbde6056300542053 (patch)
tree93dd2cece9fb6d7d9965becd61828166f920535b
parent76668ddc0b63d8b5375dfe6436034e4983611de0 (diff)
downloadnixpkgs-a98161a0da8825541d0c8b8dbde6056300542053.tar
nixpkgs-a98161a0da8825541d0c8b8dbde6056300542053.tar.gz
nixpkgs-a98161a0da8825541d0c8b8dbde6056300542053.tar.bz2
nixpkgs-a98161a0da8825541d0c8b8dbde6056300542053.tar.lz
nixpkgs-a98161a0da8825541d0c8b8dbde6056300542053.tar.xz
nixpkgs-a98161a0da8825541d0c8b8dbde6056300542053.tar.zst
nixpkgs-a98161a0da8825541d0c8b8dbde6056300542053.zip
* Updated Flash, MPlayer plugins.
svn path=/nixpkgs/trunk/; revision=9975
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix18
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix6
2 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
index d6972ac2f79..e14cfe2bea7 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
@@ -2,14 +2,24 @@
 
 assert stdenv.system == "i686-linux";
 
-(stdenv.mkDerivation {
-  name = "flashplayer-9.0.31.0";
+stdenv.mkDerivation {
+  name = "flashplayer-9.0.115.0";
 
   builder = ./builder.sh;
   src = fetchurl {
     url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz;
-    sha256 = "ad2f9eb98e976a82b62e97e7cf3a555464e43b80507b87ed7c469706faa4d897";
+    sha256 = "0yr2n7barlbvqxxzbvgp0pmbwwf7bvjksravqa47yra689jvynr7";
   };
 
   inherit zlib alsaLib;
-}) // {mozillaPlugin = "/lib/mozilla/plugins";}
+
+  passthru = {
+    mozillaPlugin = "/lib/mozilla/plugins";
+  };
+
+  meta = {
+    description = "Adobe Flash Player browser plugin";
+    homepage = http://www.adobe.com/products/flashplayer/;
+  };
+
+}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
index 12eef1c8859..1e681ade776 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
@@ -5,12 +5,12 @@
 # think).
 
 stdenv.mkDerivation {
-  name = "mplayerplug-in-3.45";
+  name = "mplayerplug-in-3.50";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://sourceforge/mplayerplug-in/mplayerplug-in-3.45.tar.gz;
-    sha256 = "0cfl0s7v1bgdak39x7s2hnx968qs3vlv09gmwms27czimn8vijiz";
+    url = mirror://sourceforge/mplayerplug-in/mplayerplug-in-3.50.tar.gz;
+    sha256 = "00jcbwl3wa6s4784c3wrz718f6jj1zkdfjbp7d2nhiafxrjqwsq4";
   };
 
   buildInputs = [pkgconfig firefox (firefox.gtk) libXpm gettext];