pyrox.dev / nixpkgs
lol
fork atom

Revert "Revert "dbus: 1.8.20 -> 1.10.8""

This reverts commit 9eb107dc52409c5f438402eadf48b5dcd64da6ac.

Thomas Tuegel f04e0e70 c5b88434

+3 -27
unified split
+3 -4
pkgs/development/libraries/dbus/default.nix
··· 6 6 && libSM != null; 7 7 8 8 let 9 - version = "1.8.20"; 10 - sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw"; 9 + version = "1.10.8"; 10 + sha256 = "0560y3hxpgh346w6avcrcz79c8ansmn771y5xpcvvlr6m8mx5wxs"; 11 11 12 12 self = stdenv.mkDerivation { 13 13 name = "dbus-${version}"; ··· 17 17 inherit sha256; 18 18 }; 19 19 20 - patches = [ ./ignore-missing-includedirs.patch ] 21 - ++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; 20 + patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; 22 21 postPatch = '' 23 22 substituteInPlace tools/Makefile.in \ 24 23 --replace 'install-localstatelibDATA:' 'disabled:' \
-23
pkgs/development/libraries/dbus/ignore-missing-includedirs.patch
··· 1 - diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c 2 - --- dbus-1.2.24-orig/bus/config-parser.c 2010-03-23 20:01:27.000000000 +0100 3 - +++ dbus-1.2.24/bus/config-parser.c 2010-07-20 14:17:20.000000000 +0200 4 - @@ -2159,12 +2159,16 @@ 5 - 6 - retval = FALSE; 7 - 8 - - dir = _dbus_directory_open (dirname, error); 9 - + dbus_error_init (&tmp_error); 10 - + 11 - + dir = _dbus_directory_open (dirname, &tmp_error); 12 - 13 - if (dir == NULL) 14 - - goto failed; 15 - + { 16 - + retval = TRUE; 17 - + goto failed; 18 - + } 19 - 20 - - dbus_error_init (&tmp_error); 21 - while (_dbus_directory_get_next_file (dir, &filename, &tmp_error)) 22 - { 23 - DBusString full_path;