diff options
-rw-r--r-- | pkgs/data/misc/ddccontrol-db/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/ddccontrol/ddccontrol-db.nix | 37 | ||||
-rw-r--r-- | pkgs/tools/misc/ddccontrol/default.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 10 insertions, 49 deletions
diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 199ed5b7eb00..3757b10754b2 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -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 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix b/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix deleted file mode 100644 index 199ed5b7eb00..000000000000 --- a/pkgs/tools/misc/ddccontrol/ddccontrol-db.nix +++ /dev/null @@ -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 ]; - }; -} \ No newline at end of file diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 3da2a14f4c7d..2d5d10054b5b 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -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 ]; }; } - \ No newline at end of file + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfbef1ac0067..8df7d40e0c81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |