diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh deleted file mode 100644 index 62b4b5a2f88..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh +++ /dev/null @@ -1,21 +0,0 @@ -source $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" - -installPhase() { - ensureDir $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 index 8cf23085d51..f9acabc0c22 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -1,14 +1,8 @@ {stdenv, fetchurl, pkgconfig, firefox, libXpm, gettext}: -# 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 rec { name = "mplayerplug-in-3.55"; - builder = ./builder.sh; - src = fetchurl { url = "mirror://sourceforge/mplayerplug-in/${name}.tar.gz"; sha256 = "0zkvqrzibrbljiccvz3rhbmgifxadlrfjylqpz48jnjx9kggynms"; @@ -16,7 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig firefox (firefox.gtk) libXpm gettext]; - inherit firefox; + installPhase = '' + ensureDir $out/lib/mozilla/plugins + cp -p mplayerplug-in*.so mplayerplug-in*.xpt $out/lib/mozilla/plugins + ''; passthru = { mozillaPlugin = "/lib/mozilla/plugins";