about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2020-04-17 07:32:41 +0200
committerGitHub <noreply@github.com>2020-04-17 07:32:41 +0200
commit6b23355abb9dea6f9f19b592e303fe3208f10592 (patch)
tree91da998e206f6913cbc751f0ab759d95ea18bfa8 /pkgs/applications/networking/browsers
parent919293492b7162227804b0a95030860af7afbc68 (diff)
parentc415d67284ad3b621a42c88e0a9bb5838708b14e (diff)
downloadnixlib-6b23355abb9dea6f9f19b592e303fe3208f10592.tar
nixlib-6b23355abb9dea6f9f19b592e303fe3208f10592.tar.gz
nixlib-6b23355abb9dea6f9f19b592e303fe3208f10592.tar.bz2
nixlib-6b23355abb9dea6f9f19b592e303fe3208f10592.tar.lz
nixlib-6b23355abb9dea6f9f19b592e303fe3208f10592.tar.xz
nixlib-6b23355abb9dea6f9f19b592e303fe3208f10592.tar.zst
nixlib-6b23355abb9dea6f9f19b592e303fe3208f10592.zip
Merge pull request #85307 from xaverdh/firefox-plugins-cleanup
firefox-wrapper: remove dead npapi plugin code
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix48
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix55
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh4
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix38
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch10
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch11
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch16
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix117
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c60
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix31
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix37
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix40
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream4
13 files changed, 19 insertions, 452 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 8256487b7518..73d2303bfc18 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -2,10 +2,8 @@
 
 ## various stuff that can be plugged in
 , flashplayer, hal-flash
-, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
-, jrePlugin, adoptopenjdk-icedtea-web
-, bluejeans, djview4, adobe-reader
-, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
+, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
+, gnome3/*.gnome-shell*/
 , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
 , tridactyl-native
 , fx_cast_bridge
@@ -26,7 +24,6 @@ let
       (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
     , nameSuffix ? ""
     , icon ? browserName
-    , extraPlugins ? []
     , extraNativeMessagingHosts ? []
     , gdkWayland ? false
     , cfg ? config.${browserName} or {}
@@ -38,32 +35,25 @@ let
       enableAdobeFlash = cfg.enableAdobeFlash or false;
       ffmpegSupport = browser.ffmpegSupport or false;
       gssSupport = browser.gssSupport or false;
-      jre = cfg.jre or false;
-      icedtea = cfg.icedtea or false;
-      supportsJDK =
-        stdenv.hostPlatform.system == "i686-linux" ||
-        stdenv.hostPlatform.system == "x86_64-linux" ||
-        stdenv.hostPlatform.system == "armv7l-linux" ||
-        stdenv.hostPlatform.system == "aarch64-linux";
 
       plugins =
-        assert !(jre && icedtea);
-        if builtins.hasAttr "enableVLC" cfg
-        then throw "The option \"${browserName}.enableVLC\" has been removed since Firefox no longer supports npapi plugins"
-        else
-        ([ ]
-          ++ lib.optional enableAdobeFlash flashplayer
-          ++ lib.optional (cfg.enableDjvu or false) (djview4)
-          ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
-          ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
-          ++ lib.optional icedtea adoptopenjdk-icedtea-web
-          ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
-          ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
-          ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell
-          ++ lib.optional (cfg.enableBluejeans or false) bluejeans
-          ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
-          ++ extraPlugins
-        );
+        let
+          removed = lib.filter (a: builtins.hasAttr a cfg) [
+            "enableVLC"
+            "enableDjvu"
+            "enableMPlayer"
+            "jre"
+            "icedtea"
+            "enableGoogleTalkPlugin"
+            "enableFriBIDPlugin"
+            "enableGnomeExtensions"
+            "enableBluejeans"
+            "enableAdobeReader"
+          ];
+        in if removed != []
+           then throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options, except for the adobe flash player, have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."
+           else lib.optional enableAdobeFlash flashplayer;
+
       nativeMessagingHosts =
         ([ ]
           ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
deleted file mode 100644
index b54070632878..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchurl, xorg, gtk2, glib, gdk-pixbuf, dpkg, libXext, libXfixes
-, libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio
-}:
-
-with stdenv.lib;
-
-let
-
-  rpathInstaller = makeLibraryPath
-    [gtk2 glib stdenv.cc.cc];
-
-  rpathPlugin = makeLibraryPath
-    ([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk-pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid);
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "bluejeans";
-
-  version = "2.180.71.8";
-
-  src = fetchurl {
-    url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb";
-    sha256 = "1fgjgzss0ghk734xpfidazyknfdn11pmyw77pc3wigl83dvx4nb2";
-  };
-
-  unpackPhase = "${dpkg}/bin/dpkg-deb -x $src .";
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -R usr/lib $out/
-
-      plugins=$out/lib/mozilla/plugins
-      patchelf \
-        --set-rpath "${rpathPlugin}" \
-        $plugins/npbjnplugin_${version}.so
-
-      patchelf \
-        --set-rpath "${rpathInstaller}" \
-        $plugins/npbjninstallplugin_${version}.so
-    '';
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  passthru.mozillaPlugin = "/lib/mozilla/plugins";
-
-  meta = {
-    homepage = "http://bluejeans.com";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = with maintainers; [ ocharles kamilchm ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh
deleted file mode 100644
index fb36125b3a17..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-source $stdenv/setup
-export PREFIX=$out
-configureFlags="--plugin-path=$out/lib/mozilla/plugins"
-genericBuild
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
deleted file mode 100644
index b59c30002d38..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }:
-
-stdenv.mkDerivation rec {
-  pname = "fribid";
-  version = "1.0.4";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = "https://fribid.se/releases/source/${pname}-${version}.tar.bz2";
-    sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl libX11 gtk2 glib gettext intltool ];
-  patches = [
-    ./translation-xgettext-to-intltool.patch
-    ./plugin-linkfix.patch
-    ./ipc-lazytrace.patch
-    ];
-
-  postPatch = "substituteInPlace plugin/pluginutil.c --replace strndup strndup_";
-
-  passthru.mozillaPlugin = "/lib/mozilla/plugins";
-
-  meta = with stdenv.lib; {
-    description = "A browser plugin to manage Swedish BankID:s";
-    longDescription = ''
-      FriBID is an open source software for the Swedish e-id system
-      called BankID. FriBID also supports processor architectures and
-      Linux/BSD distributions that the official software doesn't
-      support.
-    '';
-    homepage = "http://fribid.se";
-    license = with licenses; [ gpl2 mpl10 ];
-    maintainers = [ maintainers.edwtjo ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch
deleted file mode 100644
index b7d05ddd0ef5..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/plugin/ipc.c	2012-11-14 18:02:43.000000000 +0100
-+++ b/plugin/ipc.c	2013-09-21 08:55:39.960265058 +0200
-@@ -74,6 +74,7 @@
-         //close(pipeOut[PIPE_READ_END]);
-
-         execvp(mainBinary, (char *const *)argv);
-+        fprintf(stderr, "Wanted signing executable\t<%s>\n", mainBinary);
-         perror(BINNAME ": Failed to execute main binary");
-         exit(1);
-     } else {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch
deleted file mode 100644
index 1128381238b4..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/plugin/Makefile	2013-09-18 13:55:11.091652553 +0200
-+++ b/plugin/Makefile	2013-09-18 13:58:27.513618750 +0200
-@@ -60,7 +60,7 @@
- 	for path in $(NPAPI_PLUGIN_PATHS); do \
- 	    (../configure --internal--remove-link $(DESTDIR)$$path/libfribidplugin.so $(NPAPI_PLUGIN_LIB) || exit 1) && \
- 	    install -d $(DESTDIR)$$path && \
--	    ln -sf $(NPAPI_PLUGIN_LIB) $(DESTDIR)$$path/libfribidplugin.so; \
-+	    ln -sf $(DESTDIR)$(NPAPI_PLUGIN_LIB) $(DESTDIR)$$path/libfribidplugin.so; \
- 	done
-
- uninstall:
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch
deleted file mode 100644
index dcac4f17928b..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/translations/Makefile	2013-09-18 07:25:16.503800613 +0200
-+++ b/translations/Makefile	2013-09-18 07:25:29.495869405 +0200
-@@ -38,7 +38,7 @@
- all: template.pot $(MOFILES)
-
- template.pot: $(POTFILES) $(DEFINES)
--	xgettext -k_ -ktranslatable -d $(DOMAIN) --package-name=$(PACKAGENAME) --package-version=$(PACKAGEVERSION) --copyright-holder='YOUR NAME' -o $@ $(POTFILES)
-+	intltool-update --gettext-package=$(PACKAGENAME) -o $@ sv
-
- .po.mo:
- 	msgfmt $< -o $@
---- a/translations/POTFILES.in	2013-09-16 20:28:56.766106014 +0200
-+++ b/translations/POTFILES.in	2013-09-18 13:15:05.252689648 +0200
-@@ -0,0 +1,2 @@
-+client/gtk.c
-+client/gtk/sign.glade
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
deleted file mode 100644
index 9923b100afa1..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-{ stdenv, fetchurl, libGL, xorg, cairo
-, libpng, gtk2, glib, gdk-pixbuf, fontconfig, freetype, curl
-, dbus-glib, alsaLib, libpulseaudio, systemd, pango
-}:
-
-with stdenv.lib;
-
-let
-
-  baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin";
-
-  rpathPlugin = makeLibraryPath
-    [ libGL
-      xorg.libXt
-      xorg.libX11
-      xorg.libXrender
-      cairo
-      libpng
-      gtk2
-      glib
-      fontconfig
-      freetype
-      curl
-    ];
-
-  rpathProgram = makeLibraryPath
-    [ gdk-pixbuf
-      glib
-      gtk2
-      xorg.libX11
-      xorg.libXcomposite
-      xorg.libXfixes
-      xorg.libXrender
-      xorg.libXrandr
-      xorg.libXext
-      stdenv.cc.cc
-      alsaLib
-      libpulseaudio
-      dbus-glib
-      systemd
-      curl
-      pango
-      cairo
-    ];
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "google-talk-plugin";
-
-  # You can get the upstream version and SHA-256 hash from the following URLs:
-  # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA256'
-  # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages | grep -E 'Version|SHA256'
-  version = "5.41.3.0";
-
-  src =
-    if stdenv.hostPlatform.system == "x86_64-linux" then
-      fetchurl {
-        url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb";
-        sha256 = "af7e23d2b6215afc547f96615b99f04e0561557cc58c0c9302364b5a3840d97d";
-      }
-    else if stdenv.hostPlatform.system == "i686-linux" then
-      fetchurl {
-        url = "${baseURL}/google-talkplugin_${version}-1_i386.deb";
-        sha256 = "4c46d2b7f2018640288cd7ac49adc47e309d0beadfd979eb03030e672016b4a7";
-      }
-    else throw "Google Talk does not support your platform.";
-
-  unpackPhase = ''
-    ar p "$src" data.tar.gz | tar xz
-  '';
-
-  installPhase =
-    ''
-      plugins=$out/lib/mozilla/plugins
-      mkdir -p $plugins
-      cp opt/google/talkplugin/*.so $plugins
-
-      for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do
-        patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.cc xorg.libX11 ]}:${stdenv.cc.cc.lib}/lib64" $plugins/$i
-      done
-
-      for i in libgoogletalkremoting.so libnpo1d.so; do
-        patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.cc.lib}/lib64" $plugins/$i
-      done
-
-      mkdir -p $out/libexec/google/talkplugin
-      cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/
-
-      patchelf \
-        --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${rpathProgram}:${stdenv.cc.cc.lib}/lib64" \
-        $out/libexec/google/talkplugin/GoogleTalkPlugin
-
-      # Generate an LD_PRELOAD wrapper to redirect execvp() calls to
-      # /opt/../GoogleTalkPlugin.
-      preload=$out/libexec/google/talkplugin/libpreload.so
-      mkdir -p $(dirname $preload)
-      gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
-      echo $preload > $plugins/extra-ld-preload
-
-      # Prevent a dependency on gcc.
-      strip -S $preload
-      patchELF $preload
-    '';
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  passthru.mozillaPlugin = "/lib/mozilla/plugins";
-
-  meta = {
-    homepage = "http://www.google.com/chat/video/";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-  };
-}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
deleted file mode 100644
index 1e2c31d9527a..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Google Talk Plugin executes a helper program in /opt.  This
-   LD_PRELOAD library intercepts execvp() calls to redirect them to
-   the corresponding location in $out. */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dlfcn.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <limits.h>
-
-char origDir [] = "/opt/google/talkplugin";
-char realDir [] = OUT "/libexec/google/talkplugin";
-
-const char * rewrite(const char * path, char * buf)
-{
-    if (strncmp(path, origDir, sizeof(origDir) - 1) != 0) return path;
-    if (snprintf(buf, PATH_MAX, "%s%s", realDir, path + sizeof(origDir) - 1) >= PATH_MAX)
-        abort();
-    return buf;
-}
-
-int execvp(const char * path, char * const argv[])
-{
-    int (*_execvp) (const char *, char * const argv[]) = dlsym(RTLD_NEXT, "execvp");
-    char buf[PATH_MAX];
-    return _execvp(rewrite(path, buf), argv);
-}
-
-int open(const char *path, int flags, ...)
-{
-    char buf[PATH_MAX];
-    int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");
-    mode_t mode = 0;
-    if (flags & O_CREAT) {
-        va_list ap;
-        va_start(ap, flags);
-        mode = va_arg(ap, mode_t);
-        va_end(ap);
-    }
-    return _open(rewrite(path, buf), flags, mode);
-}
-
-int open64(const char *path, int flags, ...)
-{
-    char buf[PATH_MAX];
-    int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");
-    mode_t mode = 0;
-    if (flags & O_CREAT) {
-        va_list ap;
-        va_start(ap, flags);
-        mode = va_arg(ap, mode_t);
-        va_end(ap);
-    }
-    return _open64(rewrite(path, buf), flags, mode);
-}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
deleted file mode 100644
index a7f2815b4110..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, firefox, libX11, xorgproto }:
-
-stdenv.mkDerivation rec {
-  pname = "mozplugger";
-  version = "2.1.6";
-
-  src = fetchurl {
-    url = "http://mozplugger.mozdev.org/files/mozplugger-${version}.tar.gz";
-    sha256 = "1vszkq4kdbaxsrqr2xn9rq6ipza9fngdri79gvjqk3bvsdmg0k19";
-  };
-
-  buildInputs = [ firefox libX11 xorgproto ];
-
-  installPhase = ''
-    mkdir -p "$out/etc" "$out/bin" "$out/lib/mozilla/plugins" "$out/share/man/man7"
-    cp mozpluggerrc "$out/etc"
-    cp mozplugger-{helper,controller,linker,update} "$out/bin"
-    cp mozplugger.so "$out/lib/mozilla/plugins"
-    cp mozplugger.7 "$out/share/man/man7"
-
-    mkdir -p "$out/share/${pname}-${version}/plugin"
-    ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${pname}-${version}/plugin"
-  '';
-
-  meta = {
-    description = "Mozilla plugin for launching external program for handling in-page objects";
-    homepage = "http://mozplugger.mozdev.org/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
deleted file mode 100644
index d4561772dc59..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{stdenv, fetchurl, pkgconfig, browser, libXpm, gettext}:
-
-stdenv.mkDerivation rec {
-  name = "mplayerplug-in-3.55";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/mplayerplug-in/${name}.tar.gz";
-    sha256 = "0zkvqrzibrbljiccvz3rhbmgifxadlrfjylqpz48jnjx9kggynms";
-  };
-
-  postConfigure =
-    (if browser ? isFirefox3Like then ''
-       # Cause a rebuild of these file from the IDL file, needed for GNU IceCat 3
-       # and Mozilla Firefox 3.
-       # See, e.g., http://article.gmane.org/gmane.comp.mozilla.mplayerplug-in/2104 .
-       rm -f Source/nsIScriptableMplayerPlugin.h
-     ''
-     else "");
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ browser (browser.gtk) libXpm gettext ];
-  
-  installPhase = ''
-    mkdir -p $out/lib/mozilla/plugins
-    cp -p mplayerplug-in*.so mplayerplug-in*.xpt $out/lib/mozilla/plugins
-  '';
-
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
-
-  meta = with stdenv.lib; {
-    description = "A browser plugin that uses mplayer to play digital media from websites";
-    homepage = "http://mplayerplug-in.sourceforge.net/";
-    license = with licenses; [ gpl2Plus lgpl2Plus "MPLv1+" ];
-  };
-}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
deleted file mode 100644
index 59eef8c8f3ac..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{stdenv, fetchurl, which, pkgconfig, file, glib, gtk2, gtk3, curl, libXt}:
-let
-  srcData = # Generated upstream information 
-  rec {
-    baseName="nspluginwrapper";
-    version="1.4.4";
-    name="${baseName}-${version}";
-    hash="1fxjz9ifhw0drm12havlsl4jpsq1nv930gqa005kgddv5pa99vgj";
-    url="http://nspluginwrapper.org/download/nspluginwrapper-1.4.4.tar.gz";
-  };
-in
-stdenv.mkDerivation {
-  inherit (srcData) name version;
-
-  src = fetchurl{
-    inherit (srcData) url;
-    sha256 = srcData.hash;
-  };
-
-  preConfigure = ''
-    sed -e 's@/usr/bin/@@g' -i configure
-    sed -e '/gthread[.]h/d' -i src/npw-player.c
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lgthread-2.0"
-    export configureFlags="$configureFlags --target-cpu=$(uname -m)"
-  '';
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [which file glib gtk2 gtk3 curl libXt];
-
-  preferLocalBuild = true;
-
-  meta = {
-    description = ''A wrapper to run browser plugins out-of-process'';
-    homepage = "http://nspluginwrapper.org/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = [ "x64_64-linux" "i686-linux" ];
-    maintainers = [ stdenv.lib.maintainers.raskin ];
-    inherit (srcData) version;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream
deleted file mode 100644
index 62831613a2e2..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream
+++ /dev/null
@@ -1,4 +0,0 @@
-name nspluginwrapper
-target default.nix
-url http://nspluginwrapper.org/download/
-version_link /nspluginwrapper-[0-9]+