public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some spacing, jre in firefox wrapper made optional with true default 

svn path=/nixpkgs/branches/stdenv-updates/; revision=10743
This commit is contained in:
Yury G. Kudryashov 2008-02-18 20:52:10 +00:00
parent 343d3f0e4c
commit cc27e52366
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -879,7 +879,7 @@ rec {
wv = import ../tools/misc/wv {
inherit fetchurl stdenv libpng zlib imagemagick
pkgconfig libgsf libxml2 bzip2;
pkgconfig libgsf libxml2 bzip2;
inherit (gtkLibs) glib;
};
@ -4821,7 +4821,7 @@ rec {
# RealPlayer is disabled by default for legal reasons.
++ lib.optional (system != "i686-linux" && getConfig ["firefox" "enableRealPlayer"] false) RealPlayer
++ lib.optional (getConfig ["firefox" "enableMPlayer"] true) MPlayerPlugin
++ lib.optional (supportsJDK && jrePlugin ? mozillaPlugin) jrePlugin;
++ lib.optional (supportsJDK && getConfig ["firefox" "jre"] true && jrePlugin ? mozillaPlugin) jrePlugin;
};
x11vncFun = lib.sumArgs (selectVersion ../tools/X11/x11vnc "0.9.3") {