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

Remove outPath from dbus

Browse Source 
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
This commit is contained in:
Yury G. Kudryashov 2011-08-26 13:46:32 +00:00
parent 9c87acf5ab
commit 8c26e61e42
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,8 +58,4 @@ in rec {
# I'm too lazy to separate daemon and libs now.
daemon = libs;
# FIXME TODO
# After merger it will be better to correct upstart-job instead.
outPath = daemon.outPath;
}

4
pkgs/development/libraries/strigi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, exiv2
, clucene_core, fam, zlib, dbus
, clucene_core, fam, zlib, dbus_tools
}:
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
CLUCENE_HOME = clucene_core;
buildInputs =
[ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus.tools ];
[ cmake perl zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ];
enableParallelBuilding = true;

10
pkgs/top-level/all-packages.nix
View File

@ -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;
};

2
pkgs/top-level/release.nix
View File

@ -367,7 +367,7 @@ with (import ./release-lib.nix);
ru = all;
};
dbus = {
dbus_all = {
libs = linux;
tools = linux;
};