From e7ed35ecd84edfc427bfd22b47ee29f80d603b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 10 Mar 2011 21:39:09 +0000 Subject: [PATCH] Adding the djview firefox plugin option. svn path=/nixpkgs/trunk/; revision=26265 --- pkgs/applications/graphics/djview/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+) diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 5ebb070ef1f..85388ffa601 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation { buildInputs = [djvulibre qt4]; + passthru = { + mozillaPlugin = "/lib/netscape/plugins"; + }; + meta = { homepage = http://djvu.sourceforge.net/djview4.html; description = "A new portable DjVu viewer and browser plugin"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cae65fd7ab..95a84044e13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6847,6 +6847,7 @@ let ++ lib.optional enableAdobeFlash flashplayer # RealPlayer is disabled by default for legal reasons. ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer + ++ lib.optional (getConfig [browserName "enableDjvu"] false) (djview4) ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser) ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin