Merge pull request #46868 from benley/ddccontrol

ddccontrol: 0.4.2 -> 0.4.4

pkgs/tools/misc/ddccontrol/automake.patch

@@ -1,14 +0,0 @@
-diff --git a/src/gnome-ddcc-applet/Makefile.am b/src/gnome-ddcc-applet/Makefile.am
-index d85ff56..b13e74c 100644
---- a/src/gnome-ddcc-applet/Makefile.am
-+++ b/src/gnome-ddcc-applet/Makefile.am
-@@ -6,7 +6,8 @@ DDCC_LDADD = ../lib/libddccontrol.la
- 
- EXTRA_DIST = GNOME_ddcc-applet.server.in.in GNOME_ddcc-applet.xml
- 
--pkglib_PROGRAMS = ddcc-applet
-+programfilesdir = $(pkglibdir)
-+programfiles_PROGRAMS = ddcc-applet
- ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
- 
- ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD)

pkgs/tools/misc/ddccontrol/default.nix

@@ -1,36 +1,39 @@
-{ stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2
+{ stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2
 , pciutils, pkgconfig, gtk2, ddccontrol-db
 , makeDesktopItem
 }:
 
-let version = "0.4.2"; in
+let version = "0.4.4"; in
 stdenv.mkDerivation rec {
   name = "ddccontrol-${version}";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2";
+    owner = "ddccontrol";
-    sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1";
+    repo = "ddccontrol";
+    rev = "0.4.4";
+    sha256 = "09npy6z2j3jrvpvlr46vih31y2mbrh7wsqlbrjprxjv1j0kkz5q2";
   };
 
   nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
 
   buildInputs = [
-    perl perlPackages.libxml_perl libxml2 pciutils gtk2 ddccontrol-db
+    libxml2
+    pciutils
+    gtk2
+    ddccontrol-db
   ];
 
-  patches = [ ./automake.patch ];
-
   hardeningDisable = [ "format" "bindnow" ];
 
   prePatch = ''
-      newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g")
+    oldPath="\$""{datadir}/ddccontrol-db"
-      mv configure.ac configure.ac.old
+    newPath="${ddccontrol-db}/share/ddccontrol-db"
-      oldPath="\$"
+    sed -i -e "s|$oldPath|$newPath|" configure.ac
-      oldPath+="{datadir}\/ddccontrol-db"
+    sed -i -e "s/chmod 4711/chmod 0711/" src/ddcpci/Makefile*
-      sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac
+  '';
-      rm configure.ac.old
 
-      sed -e "s/chmod 4711/chmod 0711/" -i src/ddcpci/Makefile*
+  preConfigure = ''
+    intltoolize --force
   '';
 
   postInstall = ''
@@ -53,10 +56,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A program used to control monitor parameters by software";
-    homepage = http://ddccontrol.sourceforge.net/;
+    homepage = https://github.com/ddccontrol/ddccontrol;
     license = licenses.gpl2;
     platforms = [ "i686-linux" "x86_64-linux" ];
     maintainers = [ stdenv.lib.maintainers.pakhfn ];
   };
 }
-