* 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

1 files changed, 12 insertions, 15 deletions

diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index d32f25e50b6b6..3aa9247742b59 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -1,4 +1,5 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "timidity-2.13.0";
 
@@ -7,25 +8,21 @@ stdenv.mkDerivation {
     sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf";
   };
 
-  instruments = 
-	fetchurl {
-		url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz;
-		sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67";
-	};
-
-  buildInputs =[alsaLib];
+  instruments = fetchurl {
+    url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz;
+    sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67";
+  };
 
-  config=./timidity.cfg;
+  buildInputs = [alsaLib];
 
-  postInstall = "mkdir -p \$out/share/timidity/; 
-		cp \$config \$out/share/timidity/timidity.cfg; 
-		tar -xf \$instruments -C \$out/share/timidity/; 
-	";
+  postInstall = ''
+    mkdir -p $out/share/timidity/;
+    cp ${./timidity.cfg} $out/share/timidity/timidity.cfg
+    tar -xf $instruments -C $out/share/timidity/
+  '';
 
   meta = {
-    description = "
-	TiMidity - software MIDI renderer.
-";
+    description = "A software MIDI renderer";
   };
 }