pyrox.dev
dbus: minor update, style refactoring, parallel build
+31
-25
pkgs/development/libraries/dbus/default.nix
+31
-25
pkgs/development/libraries/dbus/default.nix
···
3
3
, libX11, libICE, libSM, useX11 ? stdenv.isLinux }:
4
4
5
5
let
6
-
version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8
7
-
sha256 = "14pfh2ksn4srfry752kf1jy3c61hklcs9fx2xglw2ifhsszplypn";
6
+
version = "1.6.14"; # 1.7.* isn't recommended, even for gnome 3.8
7
+
sha256 = "0v7mcxwfmpjf7vndnvf2kf02al61clrxs36bqii20s0lawfh2xjn";
8
8
9
9
inherit (stdenv) lib;
10
10
···
25
25
inherit sha256;
26
26
};
27
27
28
-
configureFlags = [
29
-
"--localstatedir=/var"
30
-
"--sysconfdir=/etc"
31
-
"--with-session-socket-dir=/tmp"
32
-
"--with-systemdsystemunitdir=$(out)/lib/systemd"
33
-
];
28
+
patches = [
29
+
./ignore-missing-includedirs.patch
30
+
./ucred-dirty-hack.patch
31
+
./no-create-dirs.patch
32
+
]
33
+
++ lib.optional (stdenv.isSunOS || stdenv.isLinux) ./implement-getgrouplist.patch
34
+
;
35
+
36
+
# build only the specified subdirs
37
+
postPatch = "sed '/SUBDIRS/s/=.*/=" + subdirs + "/' -i Makefile.am\n"
38
+
# use already packaged libdbus instead of trying to build it again
39
+
+ lib.optionalString (name != "libs") ''
40
+
for mfile in */Makefile.am; do
41
+
sed 's,\$(top_builddir)/dbus/\(libdbus-[0-9]\),${libs}/lib/\1,g' -i "$mfile"
42
+
done
43
+
'';
44
+
45
+
nativeBuildInputs = [ pkgconfig ];
46
+
propagatedBuildInputs = [ expat ];
47
+
buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
34
48
35
49
preConfigure = ''
36
50
patchShebangs .
···
38
52
autoreconf -fi
39
53
'';
40
54
41
-
installFlags = "sysconfdir=$(out)/etc";
42
-
43
-
doCheck = true;
55
+
configureFlags = [
56
+
"--localstatedir=/var"
57
+
"--sysconfdir=/etc"
58
+
"--with-session-socket-dir=/tmp"
59
+
"--with-systemdsystemunitdir=$(out)/lib/systemd"
60
+
];
44
61
45
-
patches = [ ./ignore-missing-includedirs.patch ]
46
-
++ lib.optional (stdenv.isSunOS || stdenv.isLinux/*avoid rebuilds*/) ./implement-getgrouplist.patch
47
-
++ [ ./ucred-dirty-hack.patch ./no-create-dirs.patch ];
62
+
enableParallelBuilding = true;
48
63
49
-
nativeBuildInputs = [ pkgconfig ];
50
-
propagatedBuildInputs = [ expat ];
51
-
buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
64
+
doCheck = true;
52
65
53
-
# build only the specified subdirs
54
-
postPatch = "sed '/SUBDIRS/s/=.*/=" + subdirs + "/' -i Makefile.am\n"
55
-
# use already packaged libdbus instead of trying to build it again
56
-
+ lib.optionalString (name != "libs") ''
57
-
for mfile in */Makefile.am; do
58
-
sed 's,\$(top_builddir)/dbus/\(libdbus-[0-9]\),${libs}/lib/\1,g' -i "$mfile"
59
-
done
60
-
'';
66
+
installFlags = "sysconfdir=$(out)/etc";
61
67
62
68
} merge ]);
63
69