Author: viric
Date: Thu Mar 10 21:39:09 2011
New Revision: 26265
URL: https://svn.nixos.org/websvn/nix/?rev=26265&sc=1
Log:
Adding the djview firefox plugin option.
Modified:
nixpkgs/trunk/pkgs/applications/graphics/djview/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/djview/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/graphics/djview/default.nix Thu Mar 10
16:27:58 2011 (r26264)
+++ nixpkgs/trunk/pkgs/applications/graphics/djview/default.nix Thu Mar 10
21:39:09 2011 (r26265)
@@ -9,6 +9,10 @@
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";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Mar 10 16:27:58
2011 (r26264)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Mar 10 21:39:09
2011 (r26265)
@@ -6847,6 +6847,7 @@
++ 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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
