* Sync with the trunk. backups/xorg-7.5@18179

svn path=/nixpkgs/branches/xorg-7.5/; revision=18122

3 files changed, 41 insertions, 4 deletions

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 7b0ad7522258e..a345cf44cc597 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 b58b289da7e7e..8a0cc3c94fee3 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 f039d86e4e5c6..899d9fb48d2d9 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/;