public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dbus.{tools,daemon}: don't provide a wrong dbus-1.pc

Browse Source 
Fixes #6086.
I think this will rebuild most of KDE and GNOME due to strigi and upower.
This commit is contained in:
Vladimír Čunát 2015-02-01 11:38:15 +01:00
parent 7d6cd236c3
commit 8ec4c682a7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,13 @@ let
stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed " stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed "
+ "-ldbus-1"; + "-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; meta.platforms = with stdenv.lib.platforms; allBut darwin;
}; };
@ -101,3 +108,4 @@ let
}; };
}; };
in attrs.libs // attrs in attrs.libs // attrs