Stylistical changes for ddccontrol

2 files changed, 78 insertions, 34 deletions

diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix
index 0835e97c5a7d..66a9a5024c01 100644
--- a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix
+++ b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix
@@ -1,17 +1,35 @@
-{ 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 {
-         name = "ddccontrol-db-${verName}";
-	 src = fetchurl {
-               url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2";
-               sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3";
-           };
-	 buildInputs =
-             [ stdenv perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ];
-	 meta=  with stdenv.lib; {
-      	    description = "Monitor database for DDCcontrol";
-            license = licenses.gpl2;
-            platforms = platforms.linux;
-         };
+  name = "ddccontrol-db-${verName}";
+  src = fetchurl {
+    url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2";
+    sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3";
+  };
+  buildInputs =
+    [
+      stdenv
+      perl
+      perlPackages.libxml_perl
+      libxml2
+      pciutils
+      pkgconfig
+      gtk
+    ];
+
+  meta = with stdenv.lib; {
+    description = "Monitor database for DDCcontrol";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
 }
\ No newline at end of file
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index 417a118a47aa..80d925cf0f98 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -1,31 +1,57 @@
-{ 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 {
-   name = "ddccontrol-${verName}";
-   src = fetchurl {
-           url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2";
-           sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1";
-         };
-   buildInputs =
-           [ stdenv intltool libtool autoconf automake110x perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ddccontrol-db];
+  name = "ddccontrol-${verName}";
+  src = fetchurl {
+    url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2";
+    sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1";
+  };
+  buildInputs =
+    [ 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")
+  prePatch = ''
+      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 = ''
+  '';
+  preConfigure = ''
       autoreconf --install
-   '';
+  '';
    
-   meta =  with stdenv.lib; {
-      description = "A program used to control monitor parameters by software";
-      license = licenses.gpl2;
-      platforms = platforms.linux;
-    };
+  meta = with stdenv.lib; {
+    description = "A program used to control monitor parameters by software";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
 }
 	 
\ No newline at end of file