* Added RealPlayer plugin support to Firefox. It's disabled by

default for legal reasons, but you can enabled it by uncommenting it
  in `all-packages-generic.nix', attribute `firefoxWrapper'.

svn path=/nixpkgs/trunk/; revision=2390

pkgs/applications/networking/browsers/firefox-wrapper/builder.sh

@@ -3,4 +3,5 @@
 
 makeWrapper "$firefox/bin/firefox" "$out/bin/firefox" \
     --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
-    --suffix-contents LD_LIBRARY_PATH ':' "$(filterExisting $(addSuffix /extra-library-path $plugins))"
+    --suffix-contents LD_LIBRARY_PATH ':' "$(filterExisting $(addSuffix /extra-library-path $plugins))" \
+    --suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"

pkgs/applications/video/RealPlayer/builder.sh

@@ -16,3 +16,6 @@ ensureDir $out/bin
 makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \
     --set HELIX_LIBS "$out/real" \
     --suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)"
+
+echo "$libstdcpp5/lib" > $out/real/mozilla/extra-library-path
+echo "$out/bin" > $out/real/mozilla/extra-bin-path

pkgs/applications/video/RealPlayer/default.nix

@@ -4,7 +4,7 @@
 
 assert stdenv.system == "i686-linux";
 
-stdenv.mkDerivation {
+(stdenv.mkDerivation {
   name = "RealPlayer-10.0.3.748-GOLD";
 
   builder = ./builder.sh;
@@ -15,5 +15,7 @@ stdenv.mkDerivation {
 
   makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
 
+  inherit libstdcpp5;
   libPath = [libstdcpp5 glib pango atk gtk libX11];
-}
+  
+}) // {mozillaPlugin = "/real/mozilla";}

pkgs/system/all-packages-generic.nix

@@ -1055,7 +1055,12 @@ rec {
 
   firefoxWrapper = (import ../applications/networking/browsers/firefox-wrapper) {
     inherit stdenv firefox;
-    plugins = [MPlayerPlugin flashplayer blackdown];
+    plugins = [
+      MPlayerPlugin
+      flashplayer
+      blackdown
+#      RealPlayer  # disabled by default for legal reasons
+    ];
   };
 
   flashplayer = (import ../applications/networking/browsers/mozilla-plugins/flashplayer) {