From 8b01d4ef0a5c43d93957ce639fac3f6af501c443 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 17 Oct 2004 13:56:56 +0000 Subject: * 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 --- .../networking/browsers/firefox-wrapper/builder.sh | 5 +++++ .../mozilla-plugins/flashplayer/builder.sh | 13 ++++++++++++ .../mozilla-plugins/flashplayer/default.nix | 13 ++++++++++++ .../mozilla-plugins/mplayerplug-in/builder.sh | 24 ++++++++++++++++++++++ .../mozilla-plugins/mplayerplug-in/default.nix | 19 +++++++++++++++++ pkgs/applications/video/mplayerplug-in/builder.sh | 24 ---------------------- pkgs/applications/video/mplayerplug-in/default.nix | 19 ----------------- 7 files changed, 74 insertions(+), 43 deletions(-) create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix delete mode 100644 pkgs/applications/video/mplayerplug-in/builder.sh delete mode 100644 pkgs/applications/video/mplayerplug-in/default.nix (limited to 'pkgs/applications') 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 < $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/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh new file mode 100644 index 000000000000..d9b895dead24 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh @@ -0,0 +1,24 @@ +. $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 + diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix new file mode 100644 index 000000000000..11a47e4d0a48 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, pkgconfig, firefox, libXpm}: + +# 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-2.70"; + + builder = ./builder.sh; + src = fetchurl { + url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-2.70.tar.gz; + md5 = "90784c7ccb40037b446053f0c1d1c2b4"; + }; + + buildInputs = [pkgconfig firefox (firefox.gtk) libXpm]; + + inherit firefox; +} diff --git a/pkgs/applications/video/mplayerplug-in/builder.sh b/pkgs/applications/video/mplayerplug-in/builder.sh deleted file mode 100644 index d9b895dead24..000000000000 --- a/pkgs/applications/video/mplayerplug-in/builder.sh +++ /dev/null @@ -1,24 +0,0 @@ -. $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 - diff --git a/pkgs/applications/video/mplayerplug-in/default.nix b/pkgs/applications/video/mplayerplug-in/default.nix deleted file mode 100644 index 11a47e4d0a48..000000000000 --- a/pkgs/applications/video/mplayerplug-in/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl, pkgconfig, firefox, libXpm}: - -# 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-2.70"; - - builder = ./builder.sh; - src = fetchurl { - url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-2.70.tar.gz; - md5 = "90784c7ccb40037b446053f0c1d1c2b4"; - }; - - buildInputs = [pkgconfig firefox (firefox.gtk) libXpm]; - - inherit firefox; -} -- cgit 1.4.1