diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-02-18 20:52:10 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-02-18 20:52:10 +0000 |
| commit | cc27e523665df525ab0a0db425053ce3d1c7d363 (patch) | |
| tree | 163573a32a613ee976c8af91ebac797cf5e34fe5 /pkgs/top-level/all-packages.nix | |
| parent | 343d3f0e4c1279b0afd61bf70cf816af6231ab7d (diff) | |
| download | nixpkgs-cc27e523665df525ab0a0db425053ce3d1c7d363.tar nixpkgs-cc27e523665df525ab0a0db425053ce3d1c7d363.tar.gz nixpkgs-cc27e523665df525ab0a0db425053ce3d1c7d363.tar.bz2 nixpkgs-cc27e523665df525ab0a0db425053ce3d1c7d363.tar.lz nixpkgs-cc27e523665df525ab0a0db425053ce3d1c7d363.tar.xz nixpkgs-cc27e523665df525ab0a0db425053ce3d1c7d363.tar.zst nixpkgs-cc27e523665df525ab0a0db425053ce3d1c7d363.zip | |
Some spacing, jre in firefox wrapper made optional with true default
svn path=/nixpkgs/branches/stdenv-updates/; revision=10743
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0039120a0f6..7a990d5afd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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") { |