From 2e06e5eb3669408f5b0fa6c64ac50ca54f8a6ee9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 23 Apr 2016 07:31:02 -0500 Subject: [PATCH 1/2] Revert "dbus: 1.8.20 -> 1.10.8" This reverts commit d088e0621e11a03cd50b27863f883fb0f8d3db36. The D-Bus update breaks logind and polkit. --- pkgs/development/libraries/dbus/default.nix | 7 +++--- .../dbus/ignore-missing-includedirs.patch | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/dbus/ignore-missing-includedirs.patch 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; From cbaca6aa7175d10b3c9820232965a797ca4bb45d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 23 Apr 2016 09:54:51 -0500 Subject: [PATCH 2/2] phonon: fix src urls --- pkgs/development/libraries/phonon/backends/gstreamer.nix | 2 +- pkgs/development/libraries/phonon/backends/vlc.nix | 2 +- pkgs/development/libraries/phonon/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 756db94e343..3f2ab6696d1 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz"; + url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; sha256 = "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf"; }; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 1f14ec575a0..aaff26eee28 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz"; + url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; sha256 = "1gnd1j305mqajw5gxm42vg6ajkvi8611bxgc3qhj5k0saz5dgkn0"; }; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 7f3a2d773cf..2356a040380 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz"; + url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz"; sha256 = "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v"; };