diff options
3 files changed, 1 insertions, 44 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 4da73326177..e5e8cacd21c 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , gnash, flashplayer, hal-flash -, MPlayerPlugin, gecko_mediaplayer, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 +, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 , supportsJDK, jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ @@ -36,7 +36,6 @@ let ++ lib.optional enableAdobeFlash flashplayer ++ lib.optional (cfg.enableDjvu or false) (djview4) ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) - ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin ++ lib.optional icedtea icedtea_web ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix deleted file mode 100644 index f59de7db9f5..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, xlibsWrapper -, GConf, gnome_mplayer, mplayer, gmtk -}: - -stdenv.mkDerivation rec { - name = "gecko-mediaplayer-1.0.5"; - - src = fetchurl { - url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz"; - sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49"; - }; - - buildInputs = [ pkgconfig glib dbus dbus_glib browser xlibsWrapper GConf browser gmtk ]; - - # !!! fix this - preBuild = - '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser}/include/xulrunner-*) -I${browser.nspr.dev}/include/nspr" - echo $NIX_CFLAGS_COMPILE - ''; - - # This plugin requires Gnome MPlayer and MPlayer to be in the - # browser's $PATH. - postInstall = - '' - echo "${gnome_mplayer}/bin:${mplayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path - ''; - - passthru.mozillaPlugin = "/lib/mozilla/plugins"; - - meta = { - description = "A browser plugin that uses GNOME MPlayer to play media in a browser"; - homepage = http://kdekorte.googlepages.com/gecko-mediaplayer; - broken = true; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01bfb68b5ab..7e83a36f0d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13530,11 +13530,6 @@ with pkgs; qrencode = callPackage ../tools/graphics/qrencode { }; - gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer { - inherit (gnome2) GConf; - browser = firefox-unwrapped; - }; - geeqie = callPackage ../applications/graphics/geeqie { }; gigedit = callPackage ../applications/audio/gigedit { }; |