pyrox.dev
ddccontrol: use autoreconfHook and fix for newer automake
+14
pkgs/tools/misc/ddccontrol/automake.patch
+14
pkgs/tools/misc/ddccontrol/automake.patch
···
1
+
diff --git a/src/gnome-ddcc-applet/Makefile.am b/src/gnome-ddcc-applet/Makefile.am
2
+
index d85ff56..b13e74c 100644
3
+
--- a/src/gnome-ddcc-applet/Makefile.am
4
+
+++ b/src/gnome-ddcc-applet/Makefile.am
5
+
@@ -6,7 +6,8 @@ DDCC_LDADD = ../lib/libddccontrol.la
6
+
7
+
EXTRA_DIST = GNOME_ddcc-applet.server.in.in GNOME_ddcc-applet.xml
8
+
9
+
-pkglib_PROGRAMS = ddcc-applet
10
+
+programfilesdir = $(pkglibdir)
11
+
+programfiles_PROGRAMS = ddcc-applet
12
+
ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h
13
+
14
+
ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD)
+9
-30
pkgs/tools/misc/ddccontrol/default.nix
+9
-30
pkgs/tools/misc/ddccontrol/default.nix
···
1
-
{ stdenv
2
-
, fetchurl
3
-
, intltool
4
-
, libtool
5
-
, autoconf
6
-
, automake110x
7
-
, perl
8
-
, perlPackages
9
-
, libxml2
10
-
, pciutils
11
-
, pkgconfig
12
-
, gtk
13
-
, ddccontrol-db
1
+
{ stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2
2
+
, pciutils, pkgconfig, gtk, ddccontrol-db
14
3
}:
15
4
16
5
let version = "0.4.2"; in
···
22
11
sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1";
23
12
};
24
13
25
-
buildInputs =
26
-
[
27
-
intltool
28
-
libtool
29
-
autoconf
30
-
automake110x
31
-
perl
32
-
perlPackages.libxml_perl
33
-
libxml2
34
-
pciutils
35
-
pkgconfig
36
-
gtk
37
-
ddccontrol-db
38
-
];
14
+
nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
15
+
16
+
buildInputs = [
17
+
perl perlPackages.libxml_perl libxml2 pciutils gtk ddccontrol-db
18
+
];
19
+
20
+
patches = [ ./automake.patch ];
39
21
40
22
hardeningDisable = [ "format" ];
41
23
···
46
28
oldPath+="{datadir}\/ddccontrol-db"
47
29
sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac
48
30
rm configure.ac.old
49
-
'';
50
-
preConfigure = ''
51
-
autoreconf --install
52
31
'';
53
32
54
33
meta = with stdenv.lib; {