Stylistical changes for ddccontrol

pkgs/tools/misc/ddccontrol/ddccontrol-db.nix

@@ -1,4 +1,13 @@
-{ stdenv, fetchurl, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk  }:
+{ stdenv
+, fetchurl
+, perl
+, perlPackages
+, libxml2
+, pciutils
+, pkgconfig
+, gtk
+}:
+
 let version = "20061014"; in
 let verName = "${version}"; in
 stdenv.mkDerivation {
@@ -8,8 +17,17 @@ stdenv.mkDerivation {
     sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3";
   };
   buildInputs =
-             [ stdenv perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ];
-	 meta=  with stdenv.lib; {
+    [
+      stdenv
+      perl
+      perlPackages.libxml_perl
+      libxml2
+      pciutils
+      pkgconfig
+      gtk
+    ];
+
+  meta = with stdenv.lib; {
     description = "Monitor database for DDCcontrol";
     license = licenses.gpl2;
     platforms = platforms.linux;

pkgs/tools/misc/ddccontrol/default.nix

@@ -1,4 +1,18 @@
-{ stdenv, fetchurl, intltool, libtool, autoconf, automake110x, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk, ddccontrol-db }:
+{ stdenv
+, fetchurl
+, intltool
+, libtool
+, autoconf
+, automake110x
+, perl
+, perlPackages
+, libxml2
+, pciutils
+, pkgconfig
+, gtk
+, ddccontrol-db
+}:
+
 let version = "0.4.2"; in
 let verName = "${version}"; in
 stdenv.mkDerivation {
@@ -8,14 +22,26 @@ stdenv.mkDerivation {
     sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1";
   };
   buildInputs =
-           [ stdenv intltool libtool autoconf automake110x perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ddccontrol-db];
+    [ stdenv
+      intltool
+      libtool
+      autoconf
+      automake110x
+      perl
+      perlPackages.libxml_perl
+      libxml2
+      pciutils
+      pkgconfig
+      gtk
+      ddccontrol-db
+    ];
 	   
   prePatch = ''
-      npath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g")
+      newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g")
       mv configure.ac configure.ac.old
-      opath="\$"
-      opath+="{datadir}\/ddccontrol-db"
-      sed "s/$opath/$npath/" <configure.ac.old >configure.ac
+      oldPath="\$"
+      oldPath+="{datadir}\/ddccontrol-db"
+      sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac
       rm configure.ac.old 
   '';
   preConfigure = ''