* Cleaned up a lot of description fields that contained newlines.

  Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

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

6 files changed, 27 insertions, 37 deletions

diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/0.2.2.nix
index e0447382e56..bd6e95b9cb2 100644
--- a/pkgs/games/construo/0.2.2.nix
+++ b/pkgs/games/construo/0.2.2.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	Construo masses and springs simulation.
-";
+		description = "Construo masses and springs simulation";
 		inherit src;
 	};
 }
diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix
index da0c127a6e7..dfc7c6c724e 100644
--- a/pkgs/games/fsg/alt-builder.nix
+++ b/pkgs/games/fsg/alt-builder.nix
@@ -28,9 +28,7 @@ stdenv.mkDerivation {
 		(textClosure localDefs [doUnpack addInputs preBuild doMake installPhase doForceShare]);
 
   meta = {
-    description = "
-	Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand.
-";
-		inherit src;
+    description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand";
+    inherit src;
   };
 }
diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index 891ac488bf3..b67b1bcfc5f 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -1,14 +1,14 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "fsg-4.4";
 
-  src = 
-	fetchurl {
-		url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;
-		sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
-	};
+  src = fetchurl {
+    url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;
+    sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
+  };
 
-  buildInputs =[gtk glib pkgconfig mesa (wxGTK null) libX11 xproto];
+  buildInputs = [gtk glib pkgconfig mesa (wxGTK null) libX11 xproto];
 
 /*  
 #	One day Unicode will overcome?
@@ -29,22 +29,20 @@ stdenv.mkDerivation {
 		cp -r . /tmp/fsg
 	";*/
 
-	preBuild = "
-		sed -e '
-		s@currentProbIndex != 100@0@;
-		' -i MainFrame.cpp;
-	";
+  preBuild = ''
+    sed -e '
+      s@currentProbIndex != 100@0@;
+    ' -i MainFrame.cpp
+  '';
 
-  installPhase = "
-		ensureDir \$out/bin \$out/libexec;
-		cp sand \$out/libexec;
-		echo -e '#! /bin/sh\nLC_ALL=C '\$out'/libexec/sand \"$@\"' >\$out/bin/fsg;
-		chmod a+x \$out/bin/fsg;
-	";
+  installPhase = ''
+    ensureDir $out/bin $out/libexec
+    cp sand $out/libexec
+    echo -e '#! /bin/sh\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg
+    chmod a+x $out/bin/fsg
+  '';
 
   meta = {
-    description = "
-	Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand.
-";
+    description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand";
   };
 }
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index 46ab9abe746..aaccc8b5171 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -13,8 +13,7 @@ stdenv.mkDerivation {
   configureFlags = "--with-zlib=${zlib}";
 
   meta = {
-    description = "A reimplementation of the Infinity Engine "
-      + " (used by Baldur's Gate, Icewind Dale, Planescape: Torment, etc.)";
+    description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate";
     homepage = http://gemrb.sourceforge.net/;
   };
 }
diff --git a/pkgs/games/orbit/1.01.nix b/pkgs/games/orbit/1.01.nix
index f128c7b90c2..1d122643f65 100644
--- a/pkgs/games/orbit/1.01.nix
+++ b/pkgs/games/orbit/1.01.nix
@@ -35,9 +35,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[ customBuild doForceShare doPropagate]);
 	meta = {
-		description = "
-		Orbit space flight simulator.
-";
+		description = "Orbit space flight simulator";
 		inherit src;
 	};
 }
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 65c6002091e..d82e29c4f1b 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,5 +1,6 @@
 args: with args;
-stdenv.mkDerivation (rec {
+
+stdenv.mkDerivation rec {
   pname = "wesnoth";
   version = "1.4.1";
 
@@ -15,8 +16,6 @@ stdenv.mkDerivation (rec {
   configureFlags = "--with-preferences-dir=.${name} --program-suffix=-${version} --with-datadir-name=${name} --with-boost=${boost}/include --disable-python";
 
   meta = {
-    description = "
-      The Battle for Wesnoth  is a free, turn-based strategy game with a fantasy theme.
-";
+    description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
   };
-})
+}