diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index d50a0076e62..fe4be4f3726 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/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 - sha256 = "14pfh2ksn4srfry752kf1jy3c61hklcs9fx2xglw2ifhsszplypn"; + version = "1.6.14"; # 1.7.* isn't recommended, even for gnome 3.8 + sha256 = "0v7mcxwfmpjf7vndnvf2kf02al61clrxs36bqii20s0lawfh2xjn"; inherit (stdenv) lib; @@ -25,30 +25,13 @@ let inherit sha256; }; - configureFlags = [ - "--localstatedir=/var" - "--sysconfdir=/etc" - "--with-session-socket-dir=/tmp" - "--with-systemdsystemunitdir=$(out)/lib/systemd" - ]; - - 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? + patches = [ + ./ignore-missing-includedirs.patch + ./ucred-dirty-hack.patch + ./no-create-dirs.patch + ] + ++ lib.optional (stdenv.isSunOS || stdenv.isLinux) ./implement-getgrouplist.patch + ; # 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" ({