From 4370f487fa9f126490a34769e8f83e5bd65e88f8 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 24 Aug 2016 21:06:43 +0000
Subject: [PATCH] ddccontrol: use autoreconfHook and fix for newer automake

---
 pkgs/tools/misc/ddccontrol/automake.patch | 14 ++++++++
 pkgs/tools/misc/ddccontrol/default.nix    | 39 ++++++-----------------
 2 files changed, 23 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/tools/misc/ddccontrol/automake.patch

diff --git a/pkgs/tools/misc/ddccontrol/automake.patch b/pkgs/tools/misc/ddccontrol/automake.patch
new file mode 100644
index 000000000000..a890654ca7c7
--- /dev/null
+++ b/pkgs/tools/misc/ddccontrol/automake.patch
@@ -0,0 +1,14 @@
+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)
diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index 132707106af0..fb11a3b87567 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -1,16 +1,5 @@
-{ stdenv
-, fetchurl
-, intltool
-, libtool
-, autoconf
-, automake110x
-, perl
-, perlPackages
-, libxml2
-, pciutils
-, pkgconfig
-, gtk
-, ddccontrol-db
+{ stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2
+, pciutils, pkgconfig, gtk, ddccontrol-db
 }:
 
 let version = "0.4.2"; in
@@ -22,20 +11,13 @@ stdenv.mkDerivation {
     sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1";
   };
 
-  buildInputs =
-    [
-      intltool
-      libtool
-      autoconf
-      automake110x
-      perl
-      perlPackages.libxml_perl
-      libxml2
-      pciutils
-      pkgconfig
-      gtk
-      ddccontrol-db
-    ];
+  nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
+
+  buildInputs = [
+    perl perlPackages.libxml_perl libxml2 pciutils gtk ddccontrol-db
+  ];
+
+  patches = [ ./automake.patch ];
 
   hardeningDisable = [ "format" ];
 
@@ -47,9 +29,6 @@ stdenv.mkDerivation {
       sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac
       rm configure.ac.old
   '';
-  preConfigure = ''
-      autoreconf --install
-  '';
 
   meta = with stdenv.lib; {
     description = "A program used to control monitor parameters by software";