From a93b037be89947d78292d98029c6fa004bc30a5a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 12 Mar 2005 13:35:27 +0000 Subject: [PATCH] * 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 --- .../networking/browsers/firefox-wrapper/builder.sh | 3 ++- pkgs/applications/video/RealPlayer/builder.sh | 3 +++ pkgs/applications/video/RealPlayer/default.nix | 6 ++++-- pkgs/system/all-packages-generic.nix | 7 ++++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh index 15ff68dd09ce..4cfe7be65a92 100644 --- a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh +++ b/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))" diff --git a/pkgs/applications/video/RealPlayer/builder.sh b/pkgs/applications/video/RealPlayer/builder.sh index f9baf5ce6381..d27a92af9e88 100644 --- a/pkgs/applications/video/RealPlayer/builder.sh +++ b/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 diff --git a/pkgs/applications/video/RealPlayer/default.nix b/pkgs/applications/video/RealPlayer/default.nix index 530577f5977a..49e5fbda21b9 100644 --- a/pkgs/applications/video/RealPlayer/default.nix +++ b/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";} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 846787750d91..d816e8ae84f4 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/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) {