diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-26 13:46:32 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-26 13:46:32 +0000 |
| commit | 8c26e61e42ee0fb4ab41535698920872e7f09ffe (patch) | |
| tree | 72c53dcefe36c6bcf25f88614f5da75e9450e37d /pkgs/top-level/all-packages.nix | |
| parent | 9c87acf5ab6bce4d91a233064af833040255e5a6 (diff) | |
| download | nixlib-8c26e61e42ee0fb4ab41535698920872e7f09ffe.tar nixlib-8c26e61e42ee0fb4ab41535698920872e7f09ffe.tar.gz nixlib-8c26e61e42ee0fb4ab41535698920872e7f09ffe.tar.bz2 nixlib-8c26e61e42ee0fb4ab41535698920872e7f09ffe.tar.lz nixlib-8c26e61e42ee0fb4ab41535698920872e7f09ffe.tar.xz nixlib-8c26e61e42ee0fb4ab41535698920872e7f09ffe.tar.zst nixlib-8c26e61e42ee0fb4ab41535698920872e7f09ffe.zip | |
Remove outPath from dbus
This was a compatibility hack. Packages should depend on dbus.libs explicitly. Should not change any hash. Will fix NixOS dbus.nix in the next commit. svn path=/nixpkgs/trunk/; revision=28831
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f113ca4fea0..3783eaaff52a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3138,7 +3138,15 @@ let db48 = callPackage ../development/libraries/db4/db4-4.8.nix { }; - dbus = callPackage ../development/libraries/dbus { + dbus = pkgs.dbus_all.libs // { inherit (pkgs.dbus_all) libs; }; + + dbus_daemon = pkgs.dbus_all.daemon; + + dbus_tools = pkgs.dbus_all.tools; + + dbus_libs = pkgs.dbus_all.libs; + + dbus_all = callPackage ../development/libraries/dbus { useX11 = true; }; |