* MPlayer Plugin updated to 2.70.

svn path=/nixpkgs/trunk/; revision=1564
This commit is contained in:
Eelco Dolstra 2004-10-17 13:13:24 +00:00
parent 17257424b1
commit a4a9543dc6
3 changed files with 35 additions and 15 deletions

View File

@ -1,9 +1,24 @@
buildinputs="$x11"
. $stdenv/setup || exit 1
. $stdenv/setup
# The Firefox pkgconfig files are buggy; they are called firefox-*.pc,
# but they refer to mozilla-*.pc. Also, mplayerplug-in requires
# mozilla-*.pc.
mkdir pkgconfig
for i in $firefox/lib/pkgconfig/*.pc; do
ln -s $i pkgconfig/$(echo $(basename $i) | sed s/firefox/mozilla/)
done
PKG_CONFIG_PATH=$NIX_BUILD_TOP/pkgconfig:$PKG_CONFIG_PATH
firefoxIncl=$(echo $firefox/include/firefox-*)
export NIX_CFLAGS_COMPILE="-I$firefoxIncl $NIX_CFLAGS_COMPILE"
dontMakeInstall=1
postInstall=postInstall
postInstall() {
mkdir -p $out/lib/mozilla/plugins
cp -p mplayerplug-in.so mplayerplug-in.xpt $out/lib/mozilla/plugins
}
genericBuild
tar xvfz $src || exit 1
cd mplayer* || exit 1
./configure || exit 1
make || exit 1
mkdir -p $out/lib/mozilla/plugins || exit 1
cp mplayerplug-in.so $out/lib/mozilla/plugins || exit 1

View File

@ -1,15 +1,19 @@
{stdenv, fetchurl, x11}:
{stdenv, fetchurl, pkgconfig, firefox, libXpm}:
assert x11 != null;
# Note: we shouldn't be dependent on Firefox. The only thing we need
# are the include files so that we can access the plugin API (I
# think).
stdenv.mkDerivation {
name = "mplayerplug-in-1.0pre2";
name = "mplayerplug-in-2.70";
builder = ./builder.sh;
src = fetchurl {
url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-1.0pre2.tar.gz;
md5 = "1a6eb243989c143984bb1aac63b5282e";
url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-2.70.tar.gz;
md5 = "90784c7ccb40037b446053f0c1d1c2b4";
};
x11 = x11;
buildInputs = [pkgconfig firefox (firefox.gtk) libXpm];
inherit firefox;
}

View File

@ -820,7 +820,8 @@ rec {
};
MPlayerPlugin = (import ../applications/video/mplayerplug-in) {
inherit fetchurl stdenv x11;
inherit fetchurl stdenv pkgconfig firefox;
inherit (xlibs) libXpm;
};
vlc = (import ../applications/video/vlc) {