diff options
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox-wrapper/builder.sh | 5 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh | 13 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh (renamed from pkgs/applications/video/mplayerplug-in/builder.sh) | 0 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix (renamed from pkgs/applications/video/mplayerplug-in/default.nix) | 0 |
5 files changed, 31 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh index ac2e0ec313ab..b4fdf2e0275a 100644 --- a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh +++ b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh @@ -3,15 +3,20 @@ mkdir -p $out/bin pluginPath= +extraLibPath= for i in $plugins; do p=$i/lib/mozilla/plugins 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 fi done cat > $out/bin/firefox <<EOF #! $SHELL +export LD_LIBRARY_PATH=$extraLibPath export MOZ_PLUGIN_PATH=$pluginPath exec $firefox/bin/firefox EOF diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh new file mode 100644 index 000000000000..085053331c76 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh @@ -0,0 +1,13 @@ +. $stdenv/setup + +dontBuild=1 +dontMakeInstall=1 + +postInstall=postInstall +postInstall() { + mkdir -p $out/lib/mozilla/plugins + cp -p flashplayer.xpt libflashplayer.so $out/lib/mozilla/plugins + echo "$zlib/lib:$libXmu/lib" > $out/lib/mozilla/plugins/extra-library-path +} + +genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix new file mode 100644 index 000000000000..f2f88430aaa7 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, zlib, libXmu}: + +stdenv.mkDerivation { + name = "flashplayer-7.0r25"; + + builder = ./builder.sh; + src = fetchurl { + url = http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/7.0r25/install_flash_player_7_linux.tar.gz; + md5 = "79c59a5ea29347e01c8e6575dd054cd1"; + }; + + inherit zlib libXmu; +} diff --git a/pkgs/applications/video/mplayerplug-in/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh index d9b895dead24..d9b895dead24 100644 --- a/pkgs/applications/video/mplayerplug-in/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh diff --git a/pkgs/applications/video/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 11a47e4d0a48..11a47e4d0a48 100644 --- a/pkgs/applications/video/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix |