ddccontrol: use autoreconfHook and fix for newer automake

This commit is contained in:
Robin Gloster 2016-08-24 21:06:43 +00:00
parent cc69ea38a5
commit 4370f487fa
2 changed files with 23 additions and 30 deletions

View File

@ -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)

View File

@ -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";