mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 08:53:21 +00:00
* Added the Flash Player plugin.
* Plugins can specify extra directories to be added to LD_LIBRARY_PATH by the Firefox wrapper. The Flash plugin need this since it's installed from a binary distribution, and so doesn't set the RPATH properly. * Moved the MPlayer plugin to a plugins directory. svn path=/nixpkgs/trunk/; revision=1566
This commit is contained in:
parent
c233d6f67c
commit
8b01d4ef0a
@ -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
|
||||
|
@ -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
|
@ -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;
|
||||
}
|
@ -798,7 +798,12 @@ rec {
|
||||
|
||||
firefoxWrapper = (import ../applications/networking/browsers/firefox-wrapper) {
|
||||
inherit stdenv firefox;
|
||||
plugins = [MPlayerPlugin];
|
||||
plugins = [MPlayerPlugin flashplayer];
|
||||
};
|
||||
|
||||
flashplayer = (import ../applications/networking/browsers/mozilla-plugins/flashplayer) {
|
||||
inherit fetchurl stdenv zlib;
|
||||
inherit (xlibs) libXmu;
|
||||
};
|
||||
|
||||
thunderbird =
|
||||
@ -824,7 +829,7 @@ rec {
|
||||
alsa = alsaLib;
|
||||
};
|
||||
|
||||
MPlayerPlugin = (import ../applications/video/mplayerplug-in) {
|
||||
MPlayerPlugin = (import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in) {
|
||||
inherit fetchurl stdenv pkgconfig firefox;
|
||||
inherit (xlibs) libXpm;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user