diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-02-01 11:38:15 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-02-01 11:43:18 +0100 |
| commit | 8ec4c682a7c1748822b1b9e9fd4e27d33f7c2aad (patch) | |
| tree | 7fe95984684f19adf1a7ad90afaab6c191578268 /pkgs/development/libraries/dbus | |
| parent | 7d6cd236c399dddc3415b7857a039d66b9bcf656 (diff) | |
| download | nixlib-8ec4c682a7c1748822b1b9e9fd4e27d33f7c2aad.tar nixlib-8ec4c682a7c1748822b1b9e9fd4e27d33f7c2aad.tar.gz nixlib-8ec4c682a7c1748822b1b9e9fd4e27d33f7c2aad.tar.bz2 nixlib-8ec4c682a7c1748822b1b9e9fd4e27d33f7c2aad.tar.lz nixlib-8ec4c682a7c1748822b1b9e9fd4e27d33f7c2aad.tar.xz nixlib-8ec4c682a7c1748822b1b9e9fd4e27d33f7c2aad.tar.zst nixlib-8ec4c682a7c1748822b1b9e9fd4e27d33f7c2aad.zip | |
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.
Diffstat (limited to 'pkgs/development/libraries/dbus')
| -rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 525ed64a97d5..f6c42f2136cb 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 + |