Stylistical changes for ddccontrol

+78 -34
+31 -13
pkgs/tools/misc/ddccontrol/ddccontrol-db.nix
··· 1 - { stdenv, fetchurl, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk }: 1 + { stdenv 2 + , fetchurl 3 + , perl 4 + , perlPackages 5 + , libxml2 6 + , pciutils 7 + , pkgconfig 8 + , gtk 9 + }: 10 + 2 11 let version = "20061014"; in 3 12 let verName = "${version}"; in 4 13 stdenv.mkDerivation { 5 - name = "ddccontrol-db-${verName}"; 6 - src = fetchurl { 7 - url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; 8 - sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; 9 - }; 10 - buildInputs = 11 - [ stdenv perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ]; 12 - meta= with stdenv.lib; { 13 - description = "Monitor database for DDCcontrol"; 14 - license = licenses.gpl2; 15 - platforms = platforms.linux; 16 - }; 14 + name = "ddccontrol-db-${verName}"; 15 + src = fetchurl { 16 + url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; 17 + sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; 18 + }; 19 + buildInputs = 20 + [ 21 + stdenv 22 + perl 23 + perlPackages.libxml_perl 24 + libxml2 25 + pciutils 26 + pkgconfig 27 + gtk 28 + ]; 29 + 30 + meta = with stdenv.lib; { 31 + description = "Monitor database for DDCcontrol"; 32 + license = licenses.gpl2; 33 + platforms = platforms.linux; 34 + }; 17 35 }
+47 -21
pkgs/tools/misc/ddccontrol/default.nix
··· 1 - { stdenv, fetchurl, intltool, libtool, autoconf, automake110x, perl, perlPackages, libxml2, pciutils, pkgconfig, gtk, ddccontrol-db }: 1 + { stdenv 2 + , fetchurl 3 + , intltool 4 + , libtool 5 + , autoconf 6 + , automake110x 7 + , perl 8 + , perlPackages 9 + , libxml2 10 + , pciutils 11 + , pkgconfig 12 + , gtk 13 + , ddccontrol-db 14 + }: 15 + 2 16 let version = "0.4.2"; in 3 17 let verName = "${version}"; in 4 18 stdenv.mkDerivation { 5 - name = "ddccontrol-${verName}"; 6 - src = fetchurl { 7 - url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; 8 - sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; 9 - }; 10 - buildInputs = 11 - [ stdenv intltool libtool autoconf automake110x perl perlPackages.libxml_perl libxml2 pciutils pkgconfig gtk ddccontrol-db]; 19 + name = "ddccontrol-${verName}"; 20 + src = fetchurl { 21 + url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; 22 + sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; 23 + }; 24 + buildInputs = 25 + [ stdenv 26 + intltool 27 + libtool 28 + autoconf 29 + automake110x 30 + perl 31 + perlPackages.libxml_perl 32 + libxml2 33 + pciutils 34 + pkgconfig 35 + gtk 36 + ddccontrol-db 37 + ]; 12 38 13 - prePatch = '' 14 - npath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") 39 + prePatch = '' 40 + newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") 15 41 mv configure.ac configure.ac.old 16 - opath="\$" 17 - opath+="{datadir}\/ddccontrol-db" 18 - sed "s/$opath/$npath/" <configure.ac.old >configure.ac 42 + oldPath="\$" 43 + oldPath+="{datadir}\/ddccontrol-db" 44 + sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac 19 45 rm configure.ac.old 20 - ''; 21 - preConfigure = '' 46 + ''; 47 + preConfigure = '' 22 48 autoreconf --install 23 - ''; 49 + ''; 24 50 25 - meta = with stdenv.lib; { 26 - description = "A program used to control monitor parameters by software"; 27 - license = licenses.gpl2; 28 - platforms = platforms.linux; 29 - }; 51 + meta = with stdenv.lib; { 52 + description = "A program used to control monitor parameters by software"; 53 + license = licenses.gpl2; 54 + platforms = platforms.linux; 55 + }; 30 56 } 31 57