diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-02-16 11:24:40 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-02-16 11:24:40 +0000 |
commit | 3bf404a3f2407b427a75417ca632c5fbd9869f0d (patch) | |
tree | ed0b5809fdbef04fd285a2b4e1c71f241b1c7c7d /pkgs/applications/networking | |
parent | b93096780562ec3b8538be9ac0ab77b58eaaf8c8 (diff) | |
download | nixlib-3bf404a3f2407b427a75417ca632c5fbd9869f0d.tar nixlib-3bf404a3f2407b427a75417ca632c5fbd9869f0d.tar.gz nixlib-3bf404a3f2407b427a75417ca632c5fbd9869f0d.tar.bz2 nixlib-3bf404a3f2407b427a75417ca632c5fbd9869f0d.tar.lz nixlib-3bf404a3f2407b427a75417ca632c5fbd9869f0d.tar.xz nixlib-3bf404a3f2407b427a75417ca632c5fbd9869f0d.tar.zst nixlib-3bf404a3f2407b427a75417ca632c5fbd9869f0d.zip |
* Let the Mozilla plugins announce where in their output the actual
plugins are, rather then requiring certain fixed directories. svn path=/nixpkgs/trunk/; revision=2242
Diffstat (limited to 'pkgs/applications/networking')
4 files changed, 17 insertions, 15 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh index 50b14bf9b6b7..2b7e68e0b144 100644 --- a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh +++ b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh @@ -5,20 +5,18 @@ shopt -s nullglob pluginPath= extraLibPath= -for i in $plugins; do - for p in $i/lib/mozilla/plugins $i/jre/plugin/*/mozilla; do - if test -e $p; then - pluginPath=$pluginPath${pluginPath:+:}$p - if test -e $p/extra-library-path; then - extraLibPath=$extraLibPath${extraLibPath:+:}$(cat $p/extra-library-path) - fi +for p in $plugins; do + if test -e $p; then + pluginPath=$pluginPath${pluginPath:+:}$p + if test -e $p/extra-library-path; then + extraLibPath=$extraLibPath${extraLibPath:+:}$(cat $p/extra-library-path) fi - done + fi done makeWrapper "$firefox/bin/firefox" "$out/bin/firefox" \ - --suffix MOZ_PLUGIN_PATH ':' $pluginPath \ - --suffix LD_LIBRARY_PATH ':' $extraLibPath + --suffix MOZ_PLUGIN_PATH ':' "$pluginPath" \ + --suffix LD_LIBRARY_PATH ':' "$extraLibPath" # --add-to-env MOZ_PLUGIN_PATH ':' --each lib/mozilla/plugins "$plugins" \ # --add-to-env MOZ_PLUGIN_PATH ':' --each 'jre/plugin/*/mozilla' "$plugins" \ diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix index eb6c6f3bde3c..c806d88c80a3 100644 --- a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix +++ b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix @@ -6,5 +6,9 @@ stdenv.mkDerivation { builder = ./builder.sh; makeWrapper = ../../../../build-support/make-wrapper/make-wrapper.sh; - inherit firefox plugins; + inherit firefox; + + # Let each plugin tell us (through its `mozillaPlugin') attribute + # where to find the plugin in its tree. + plugins = map (x: x ~ x.mozillaPlugin) plugins; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 2412cbdc1c37..76256ee590c1 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, zlib, libXmu}: -stdenv.mkDerivation { +(stdenv.mkDerivation { name = "flashplayer-7.0r25"; builder = ./builder.sh; @@ -10,4 +10,4 @@ stdenv.mkDerivation { }; inherit zlib libXmu; -} +}) // {mozillaPlugin = "/lib/mozilla/plugins";} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 94ed76abcd5f..0eb6ff07a2de 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -4,7 +4,7 @@ # are the include files so that we can access the plugin API (I # think). -stdenv.mkDerivation { +(stdenv.mkDerivation { name = "mplayerplug-in-2.70"; builder = ./builder.sh; @@ -16,4 +16,4 @@ stdenv.mkDerivation { buildInputs = [pkgconfig firefox (firefox.gtk) libXpm]; inherit firefox; -} +}) // {mozillaPlugin = "/lib/mozilla/plugins";} |