* More descriptions.

svn path=/nixpkgs/trunk/; revision=6709

6 files changed, 26 insertions, 1 deletions

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index d4abb46c3b7ad..1abc4be3c6030 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -11,4 +11,8 @@ stdenv.mkDerivation {
  
   inherit ncurses;
   buildInputs = [ncurses];
+
+  meta = {
+    description = "The most popular clone of the VI editor";
+  };
 }
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index 44476fca4ddf1..1137a9d883854 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -7,4 +7,8 @@ stdenv.mkDerivation {
     md5 = "12e1faf49447c743c5c936636cd8a172";
   };
   buildInputs = [wxGTK chmlib];
+
+  meta = {
+    description = "A viewer for Microsoft HTML Help files";
+  };
 }
diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
index a63dd61b24345..45c18dba2770b 100644
--- a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation {
   plugins = map (x: x + x.mozillaPlugin) plugins;
 
   meta = {
-    description = firefox.meta.description + " (with various plugins)";
+    description =
+      firefox.meta.description
+      + " (with plugins: "
+      + (let lib = import ../../../../lib;
+        in lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins)))
+      + ")";
   };
 }
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 7e0d66fcf825f..4bd477043377a 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -12,4 +12,8 @@ stdenv.mkDerivation {
   };
   configureFlags = (if sslSupport then "--with-ssl" else "");
   buildInputs = [ncurses (if sslSupport then openssl else null)];
+
+  meta = {
+    description = "A text-mode web browser";
+  };
 }
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 6239ed1527116..4ab74b8227f20 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -27,4 +27,8 @@ stdenv.mkDerivation {
   NIX_LDFLAGS = "-ldvdcss";
 
   configureFlags = "--enable-alsa";
+
+  meta = {
+    description = "Cross-platform media player and streaming server";
+  };
 }
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 5795f98aa65f8..e96252fc73869 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -11,4 +11,8 @@ stdenv.mkDerivation {
     (if xineLib.xineramaSupport then xineLib.libXinerama else null)
   ];
   configureFlags = "--without-readline --disable-xft";
+
+  meta = {
+    description = "Xlib-based interface to Xine, a video player";
+  };
 }