From bbf7342a106f6301b0a852b1650d25ec36fb2eb6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 16 Oct 2008 13:36:27 +0000
Subject: [PATCH] * Added Adobe Flash Player 10.

svn path=/nixpkgs/trunk/; revision=13085
---
 .../mozilla-plugins/flashplayer-10/builder.sh | 12 +++++++++
 .../flashplayer-10/default.nix                | 27 +++++++++++++++++++
 .../mozilla-plugins/flashplayer-7/builder.sh  |  9 -------
 .../mozilla-plugins/flashplayer-7/default.nix | 13 ---------
 pkgs/top-level/all-packages.nix               |  9 +++----
 5 files changed, 43 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh
 create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
 delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh
 delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh
new file mode 100644
index 000000000000..551b0e1c03fa
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh
@@ -0,0 +1,12 @@
+source $stdenv/setup
+
+dontStrip=1
+dontPatchELF=1
+
+installPhase() {
+    ensureDir $out/lib/mozilla/plugins
+    cp -p libflashplayer.so $out/lib/mozilla/plugins
+    patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
+}
+
+genericBuild
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
new file mode 100644
index 000000000000..9cb9ef8bb5ab
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, zlib, alsaLib, curl}:
+
+assert stdenv.system == "i686-linux";
+
+stdenv.mkDerivation {
+  name = "flashplayer-10.0.12.36";
+
+  builder = ./builder.sh;
+  
+  src = fetchurl {
+    url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
+    sha256 = "0bcn07a3684krqbh6cw08hb8lymm0wijnlcx5bvln44749kzg7wf";
+  };
+
+  inherit zlib alsaLib;
+
+  passthru = {
+    mozillaPlugin = "/lib/mozilla/plugins";
+  };
+
+  rpath = "${zlib}/lib:${alsaLib}/lib:${curl}/lib";
+
+  meta = {
+    description = "Adobe Flash Player browser plugin";
+    homepage = http://www.adobe.com/products/flashplayer/;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh
deleted file mode 100644
index 79dbec0340fb..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-installPhase() {
-    mkdir -p $out/lib/mozilla/plugins
-    cp -p flashplayer.xpt libflashplayer.so $out/lib/mozilla/plugins
-    echo "$zlib/lib:$libXmu/lib" > $out/lib/mozilla/plugins/extra-library-path
-}
-
-genericBuild
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix
deleted file mode 100644
index 776e926acd5c..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, zlib, libXmu}:
-
-(stdenv.mkDerivation {
-  name = "flashplayer-7.0r25";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/install_flash_player_7_linux.tar.gz;
-    md5 = "79c59a5ea29347e01c8e6575dd054cd1";
-  };
-
-  inherit zlib libXmu;
-}) // {mozillaPlugin = "/lib/mozilla/plugins";}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8be37dfb4570..5a0fb64bcab1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6312,15 +6312,14 @@ let
 
   flashplayer = flashplayer9;
 
-  flashplayer7 = import ../applications/networking/browsers/mozilla-plugins/flashplayer-7 {
-    inherit fetchurl stdenv zlib;
-    inherit (xlibs) libXmu;
-  };
-
   flashplayer9 = import ../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
     inherit fetchurl stdenv zlib alsaLib;
   };
 
+  flashplayer10 = import ../applications/networking/browsers/mozilla-plugins/flashplayer-10 {
+    inherit fetchurl stdenv zlib alsaLib curl;
+  };
+
   flite = import ../applications/misc/flite {
     inherit fetchurl stdenv;
   };