ddccontrol*: cleanup
- remove doubled file for ddccontrol-db - adding stdenv to buildInputs is pointless - fix doubled http:// - whitespace, etc.
This commit is contained in:
parent
eb8105ad01
commit
f41f7a0bb9
|
@ -18,7 +18,6 @@ stdenv.mkDerivation {
|
|||
};
|
||||
buildInputs =
|
||||
[
|
||||
stdenv
|
||||
perl
|
||||
perlPackages.libxml_perl
|
||||
libxml2
|
||||
|
@ -29,9 +28,9 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Monitor database for DDCcontrol";
|
||||
homepage = "http://http://ddccontrol.sourceforge.net/";
|
||||
homepage = "http://ddccontrol.sourceforge.net/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.pakhfn ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
{ 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";
|
||||
homepage = "http://http://ddccontrol.sourceforge.net/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.pakhfn ];
|
||||
};
|
||||
}
|
|
@ -14,15 +14,14 @@
|
|||
}:
|
||||
|
||||
let version = "0.4.2"; in
|
||||
let verName = "${version}"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "ddccontrol-${verName}";
|
||||
name = "ddccontrol-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2";
|
||||
sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1";
|
||||
};
|
||||
buildInputs =
|
||||
[ stdenv
|
||||
[
|
||||
intltool
|
||||
libtool
|
||||
autoconf
|
||||
|
@ -35,25 +34,25 @@ stdenv.mkDerivation {
|
|||
gtk
|
||||
ddccontrol-db
|
||||
];
|
||||
|
||||
|
||||
prePatch = ''
|
||||
newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g")
|
||||
mv configure.ac configure.ac.old
|
||||
oldPath="\$"
|
||||
oldPath+="{datadir}\/ddccontrol-db"
|
||||
sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac
|
||||
rm configure.ac.old
|
||||
rm configure.ac.old
|
||||
'';
|
||||
preConfigure = ''
|
||||
autoreconf --install
|
||||
'';
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A program used to control monitor parameters by software";
|
||||
homepage = "http://http://ddccontrol.sourceforge.net/";
|
||||
homepage = "http://ddccontrol.sourceforge.net/";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.pakhfn ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1010,7 +1010,7 @@ let
|
|||
ddccontrol = callPackage ../tools/misc/ddccontrol { };
|
||||
|
||||
ddccontrol-db = callPackage ../data/misc/ddccontrol-db { };
|
||||
|
||||
|
||||
ddclient = callPackage ../tools/networking/ddclient { };
|
||||
|
||||
dd_rescue = callPackage ../tools/system/dd_rescue { };
|
||||
|
|
Loading…
Reference in a new issue