diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-23 07:31:02 -0500 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-24 20:08:39 +0200 |
| commit | 9eb107dc52409c5f438402eadf48b5dcd64da6ac (patch) | |
| tree | 970becf2050aee8ca3124f467ca1a1c666be3f95 /pkgs/development/libraries/dbus | |
| parent | 6700ed5f4838a4b8d56ca7a65ca6df34c1c65d50 (diff) | |
| download | nixpkgs-9eb107dc52409c5f438402eadf48b5dcd64da6ac.tar nixpkgs-9eb107dc52409c5f438402eadf48b5dcd64da6ac.tar.gz nixpkgs-9eb107dc52409c5f438402eadf48b5dcd64da6ac.tar.bz2 nixpkgs-9eb107dc52409c5f438402eadf48b5dcd64da6ac.tar.lz nixpkgs-9eb107dc52409c5f438402eadf48b5dcd64da6ac.tar.xz nixpkgs-9eb107dc52409c5f438402eadf48b5dcd64da6ac.tar.zst nixpkgs-9eb107dc52409c5f438402eadf48b5dcd64da6ac.zip | |
Revert "dbus: 1.8.20 -> 1.10.8"
This reverts commit d088e0621e11a03cd50b27863f883fb0f8d3db36. The D-Bus update breaks logind and polkit. (cherry picked from commit 2e06e5eb3669408f5b0fa6c64ac50ca54f8a6ee9) 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.
Diffstat (limited to 'pkgs/development/libraries/dbus')
| -rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/dbus/ignore-missing-includedirs.patch | 23 |
2 files changed, 27 insertions, 3 deletions
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index dd86ca54081..83635d9739f 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -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:' \ diff --git a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch new file mode 100644 index 00000000000..2781f4ae3de --- /dev/null +++ b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch @@ -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; |