ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

Revert "dbus: 1.8.20 -> 1.10.8"

Browse Source 
This reverts commit d088e0621e.

The D-Bus update breaks logind and polkit.

(cherry picked from commit 2e06e5eb36)

Hydra had rebuilt this on staging, fixing many test problems.
There were also phonon changes in these rebuilds, but the amount of
binaries affected by them is relatively low and I'm not yet fully
convinced of their stability.
This commit is contained in:
Thomas Tuegel 2016-04-23 07:31:02 -05:00 committed by Vladimír Čunát
parent 6700ed5f48
commit 9eb107dc52
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/dbus/default.nix
View File

@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
&& libSM != null;
let
version = "1.10.8";
sha256 = "0560y3hxpgh346w6avcrcz79c8ansmn771y5xpcvvlr6m8mx5wxs";
version = "1.8.20";
sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw";
self = stdenv.mkDerivation {
name = "dbus-${version}";
@ -17,7 +17,8 @@ self = stdenv.mkDerivation {
inherit sha256;
};
patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
patches = [ ./ignore-missing-includedirs.patch ]
++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
postPatch = ''
substituteInPlace tools/Makefile.in \
--replace 'install-localstatelibDATA:' 'disabled:' \

23
pkgs/development/libraries/dbus/ignore-missing-includedirs.patch Normal file
View File

@ -0,0 +1,23 @@
diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c
--- dbus-1.2.24-orig/bus/config-parser.c 2010-03-23 20:01:27.000000000 +0100
+++ dbus-1.2.24/bus/config-parser.c 2010-07-20 14:17:20.000000000 +0200
@@ -2159,12 +2159,16 @@
retval = FALSE;
- dir = _dbus_directory_open (dirname, error);
+ dbus_error_init (&tmp_error);
+
+ dir = _dbus_directory_open (dirname, &tmp_error);
if (dir == NULL)
- goto failed;
+ {
+ retval = TRUE;
+ goto failed;
+ }
- dbus_error_init (&tmp_error);
while (_dbus_directory_get_next_file (dir, &filename, &tmp_error))
{
DBusString full_path;