From a73cef105752a55749261f1b22d3ae716e0bd5bd Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 30 Oct 2009 12:28:44 +0000
Subject: [PATCH] added chromeWrapper, like firefoxWrapper, to allow plugins to
 work, added previously undefined dependencies on flash plugin

svn path=/nixpkgs/trunk/; revision=18050
---
 .../networking/browsers/chromium/default.nix  |  6 ++++-
 .../flashplayer-10/default.nix                | 22 +++++++++++++++++--
 .../mozilla-plugins/flashplayer-9/builder.sh  |  2 +-
 .../mozilla-plugins/flashplayer-9/default.nix | 21 +++++++++++++++++-
 pkgs/top-level/all-packages.nix               | 13 ++++++++---
 5 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 97074d47fa2..b72e7022760 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -14,6 +14,7 @@
 , libX11
 , GConf
 , libXext
+, libXt
 , atk
 , makeWrapper
 , unzip
@@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
 
   libPath = 
     stdenv.lib.makeLibraryPath
-       [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk ] ;
+       [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt] ;
 
   installPhase = ''
     ensureDir $out/bin
@@ -65,4 +66,7 @@ stdenv.mkDerivation rec {
     ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
   '';
 
+  meta = {
+    description = "";
+  };
 }
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
index 7b0ad752225..a345cf44cc5 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
@@ -1,4 +1,22 @@
-{stdenv, fetchurl, zlib, alsaLib, curl}:
+{ stdenv
+, fetchurl
+, zlib
+, alsaLib
+, curl
+, nss
+, nspr
+, fontconfig
+, freetype
+, expat
+, libX11
+, libXext
+, libXrender
+, libXt
+, gtk 
+, glib
+, pango
+, atk
+}:
 
 stdenv.mkDerivation {
   name = "flashplayer-10.0.32.18";
@@ -23,7 +41,7 @@ stdenv.mkDerivation {
     mozillaPlugin = "/lib/mozilla/plugins";
   };
 
-  rpath = "${zlib}/lib:${alsaLib}/lib:${curl}/lib";
+  rpath = stdenv.lib.makeLibraryPath [zlib alsaLib curl nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ;
 
   meta = {
     description = "Adobe Flash Player browser plugin";
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
index b58b289da7e..8a0cc3c94fe 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
@@ -6,7 +6,7 @@ dontPatchELF=1
 installPhase() {
     ensureDir $out/lib/mozilla/plugins
     cp -p libflashplayer.so $out/lib/mozilla/plugins
-    patchelf --set-rpath "$zlib/lib:$alsaLib/lib" $out/lib/mozilla/plugins/libflashplayer.so
+    patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so
 }
 
 genericBuild
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 f039d86e4e5..899d9fb48d2 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
@@ -1,4 +1,21 @@
-{stdenv, fetchurl, zlib, alsaLib}:
+{ stdenv
+, fetchurl
+, zlib
+, alsaLib
+, nss
+, nspr
+, fontconfig
+, freetype
+, expat
+, libX11
+, libXext
+, libXrender
+, libXt
+, gtk
+, glib
+, pango
+, atk
+}:
 
 assert stdenv.system == "i686-linux";
 
@@ -17,6 +34,8 @@ stdenv.mkDerivation {
     mozillaPlugin = "/lib/mozilla/plugins";
   };
 
+  rpath = stdenv.lib.makeLibraryPath [zlib alsaLib nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ;
+
   meta = {
     description = "Adobe Flash Player browser plugin";
     homepage = http://www.adobe.com/products/flashplayer/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a76a05233dd..6bd9edf2764 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6574,11 +6574,14 @@ let
 
   chrome = import ../applications/networking/browsers/chromium {
     inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip patchelf05;
-    inherit (xlibs) libX11 libXext libXrender ;
+    inherit (xlibs) libX11 libXext libXrender libXt ;
     inherit (gtkLibs) gtk glib pango atk;
     inherit (gnome) GConf;
   };
 
+  chromeWrapper = wrapFirefox chrome "chrome" "";
+
+
   cinelerra = import ../applications/video/cinelerra {
     inherit fetchurl stdenv
       automake autoconf libtool
@@ -7020,12 +7023,16 @@ let
 
   flashplayer9 = (
     import ../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
-      inherit fetchurl stdenv zlib alsaLib;
+      inherit fetchurl stdenv zlib alsaLib nss nspr fontconfig freetype expat;
+      inherit (xlibs) libX11 libXext libXrender libXt ;
+      inherit (gtkLibs) gtk glib pango atk;
     });
 
   flashplayer10 = (
     import ../applications/networking/browsers/mozilla-plugins/flashplayer-10 {
-      inherit fetchurl stdenv zlib alsaLib curl;
+      inherit fetchurl stdenv zlib alsaLib curl nss nspr fontconfig freetype expat;
+      inherit (xlibs) libX11 libXext libXrender libXt ;
+      inherit (gtkLibs) gtk glib pango atk;
     });
 
   flite = import ../applications/misc/flite {