From 8ec4c682a7c1748822b1b9e9fd4e27d33f7c2aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 1 Feb 2015 11:38:15 +0100
Subject: [PATCH] dbus.{tools,daemon}: don't provide a wrong dbus-1.pc

Fixes #6086.
I think this will rebuild most of KDE and GNOME due to strigi and upower.
---
 pkgs/development/libraries/dbus/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 525ed64a97d..f6c42f2136c 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -91,6 +91,13 @@ let
       stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed "
       + "-ldbus-1";
 
+    # don't provide another dbus-1.pc (with incorrect include and link dirs),
+    # also remove useless empty dirs
+    postInstall = ''
+      rm "$out"/lib/pkgconfig/dbus-1.pc
+      rmdir --parents --ignore-fail-on-non-empty "$out"/{lib/pkgconfig,share/dbus-1/*}
+    '';
+
     meta.platforms = with stdenv.lib.platforms; allBut darwin;
   };
 
@@ -101,3 +108,4 @@ let
   };
 };
 in attrs.libs // attrs
+