dbus: minor update, style refactoring, parallel build

pkgs/development/libraries/dbus/default.nix

@@ -3,8 +3,8 @@
 , libX11, libICE, libSM, useX11 ? stdenv.isLinux }:
 
 let
-  version = "1.6.12"; # 1.7.* isn't recommended, even for gnome 3.8
+  version = "1.6.14"; # 1.7.* isn't recommended, even for gnome 3.8
-  sha256 = "14pfh2ksn4srfry752kf1jy3c61hklcs9fx2xglw2ifhsszplypn";
+  sha256 = "0v7mcxwfmpjf7vndnvf2kf02al61clrxs36bqii20s0lawfh2xjn";
 
   inherit (stdenv) lib;
 
@@ -25,30 +25,13 @@ let
       inherit sha256;
     };
 
-    configureFlags = [
+    patches = [
-      "--localstatedir=/var"
+        ./ignore-missing-includedirs.patch
-      "--sysconfdir=/etc"
+        ./ucred-dirty-hack.patch
-      "--with-session-socket-dir=/tmp"
+        ./no-create-dirs.patch
-      "--with-systemdsystemunitdir=$(out)/lib/systemd"
+      ]
-    ];
+      ++ lib.optional (stdenv.isSunOS || stdenv.isLinux) ./implement-getgrouplist.patch
-
+      ;
-    preConfigure = ''
-      patchShebangs .
-      substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
-      autoreconf -fi
-    '';
-
-    installFlags = "sysconfdir=$(out)/etc";
-
-    doCheck = true;
-
-    patches = [ ./ignore-missing-includedirs.patch ]
-      ++ lib.optional (stdenv.isSunOS || stdenv.isLinux/*avoid rebuilds*/) ./implement-getgrouplist.patch
-      ++ [ ./ucred-dirty-hack.patch ./no-create-dirs.patch ];
-
-    nativeBuildInputs = [ pkgconfig ];
-    propagatedBuildInputs = [ expat ];
-    buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
 
     # build only the specified subdirs
     postPatch = "sed '/SUBDIRS/s/=.*/=" + subdirs + "/' -i Makefile.am\n"
@@ -59,6 +42,29 @@ let
           done
         '';
 
+    nativeBuildInputs = [ pkgconfig ];
+    propagatedBuildInputs = [ expat ];
+    buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
+
+    preConfigure = ''
+      patchShebangs .
+      substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
+      autoreconf -fi
+    '';
+
+    configureFlags = [
+      "--localstatedir=/var"
+      "--sysconfdir=/etc"
+      "--with-session-socket-dir=/tmp"
+      "--with-systemdsystemunitdir=$(out)/lib/systemd"
+    ];
+
+    enableParallelBuilding = true;
+
+    doCheck = true;
+
+    installFlags = "sysconfdir=$(out)/etc";
+
   } merge ]);
 
   libs = dbus_drv "libs" "dbus" ({