Author: urkud
Date: Fri Aug 26 13:46:32 2011
New Revision: 28831
URL: https://svn.nixos.org/websvn/nix/?rev=28831&sc=1
Log:
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.
Modified:
nixpkgs/trunk/pkgs/development/libraries/dbus/default.nix
nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/release.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/dbus/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/dbus/default.nix Fri Aug 26
11:21:56 2011 (r28830)
+++ nixpkgs/trunk/pkgs/development/libraries/dbus/default.nix Fri Aug 26
13:46:32 2011 (r28831)
@@ -58,8 +58,4 @@
# 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;
}
Modified: nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix Fri Aug 26
11:21:56 2011 (r28830)
+++ nixpkgs/trunk/pkgs/development/libraries/strigi/default.nix Fri Aug 26
13:46:32 2011 (r28831)
@@ -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 @@
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;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 26 11:21:56
2011 (r28830)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 26 13:46:32
2011 (r28831)
@@ -3138,7 +3138,15 @@
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;
};
Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/release.nix Fri Aug 26 11:21:56 2011
(r28830)
+++ nixpkgs/trunk/pkgs/top-level/release.nix Fri Aug 26 13:46:32 2011
(r28831)
@@ -367,7 +367,7 @@
ru = all;
};
- dbus = {
+ dbus_all = {
libs = linux;
tools = linux;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
