* 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, 3 insertions, 4 deletions

diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix
index e1f8d710500..f400229ecc7 100644
--- a/pkgs/os-specific/linux/acpitool/default.nix
+++ b/pkgs/os-specific/linux/acpitool/default.nix
@@ -1,16 +1,15 @@
-args: with args;
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "acpitool-0.4.7";
+  
   src = fetchurl {
     url = "mirror://sourceforge/acpitool/${name}.tar.bz2";
     sha256 = "133bdgcq9ql0l940kp9m2v6wzdvkyv8f1dizwjbx7v96n8g2c239";
   };
 
-
   meta = {
-    description = ''ACPI Tool is a small, convenient command-line
-                    ACPI client with a lot of features for Linux.'';
+    description = "A small, convenient command-line ACPI client with a lot of features";
     homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml;
     license = "GPLv2+";
   };