Commit Graph

35 Commits

Author SHA1 Message Date
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
55aed5fc1f dbus: bugfix update (still 1.6 branch) 2013-05-02 18:34:21 +02:00
Vladimír Čunát
7d9607f151 dbus: minor update, reorganize and polish the expression 2013-04-11 22:17:26 +02:00
Vladimír Čunát
fe4a067aad dbus: modularize into libs, daemon, tools, tests and docs 2013-04-04 22:00:46 +02:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5b7d7b11f3 dbus: Update to 1.6.4 2012-09-26 22:21:14 -04:00
Yury G. Kudryashov
14bbbbbed2 Review dbus-lib expression
* Move pkgconfig to buildNativeInputs

svn path=/nixpkgs/branches/stdenv-updates/; revision=30895
2011-12-14 18:22:55 +00:00
Yury G. Kudryashov
3103799d47 Update dbus and dbus-glib to the latest stable versions
Drop unstable versions

svn path=/nixpkgs/branches/stdenv-updates/; revision=30893
2011-12-14 18:22:34 +00:00
Yury G. Kudryashov
0a3e9cad72 Make dbus_all_1_5_6.tools compile
svn path=/nixpkgs/trunk/; revision=29568
2011-10-02 18:12:29 +00:00
Yury G. Kudryashov
2683407fe4 Add newer dbus and dbus-glib
Old versions are kept to prevent huge rebuild

svn path=/nixpkgs/trunk/; revision=28836
2011-08-26 14:57:48 +00:00
Yury G. Kudryashov
8c26e61e42 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
2011-08-26 13:46:32 +00:00
Eelco Dolstra
5a04f8450d * Hack to fix D-Bus X11 autolaunch support in D-Bus >= 1.4.8.
svn path=/nixpkgs/branches/kde-4.7/; revision=28140
2011-08-03 11:45:57 +00:00
Eelco Dolstra
c64cd58c95 * D-Bus updated to 1.4.14.
svn path=/nixpkgs/branches/kde-4.7/; revision=28114
2011-08-01 14:35:31 +00:00
Eelco Dolstra
c8fbe3a724 * DBus updated to 1.4.10.
svn path=/nixpkgs/branches/kde-4.7/; revision=27626
2011-07-07 15:44:12 +00:00
Eelco Dolstra
927a41492d * Updated dbus, glib, gtk+.
svn path=/nixpkgs/branches/x-updates/; revision=26156
2011-03-04 11:59:04 +00:00
Eelco Dolstra
e877e4dc13 * Dbus 1.4.1.
svn path=/nixpkgs/branches/x-updates/; revision=25903
2011-02-11 14:01:39 +00:00
Eelco Dolstra
0f53a3fca8 * Ignore missing directories in the <includedir> element. This allows
the NixOS system bus configuration to include directories such as

    /nix/var/nix/profiles/default/etc/dbus-1/system.d/

  which may not exist.

svn path=/nixpkgs/branches/x-updates/; revision=22672
2010-07-20 12:53:07 +00:00
Eelco Dolstra
d514ac437a * Dbus updated to 1.2.24.
svn path=/nixpkgs/branches/x-updates/; revision=22646
2010-07-18 22:00:40 +00:00
Marc Weber
cb9030b947 use --with-dbus-daemondir= cause DBUS_DAEMONDIR seems to be broken?
dbus-launch no longer reports any errors

svn path=/nixpkgs/trunk/; revision=19919
2010-02-11 02:43:45 +00:00
Eelco Dolstra
6f04e6a5d6 * Merge the temporary copy of dbus.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18052
2009-10-30 12:36:32 +00:00
Eelco Dolstra
c2c7c18316 * dbus: get the configuration from /etc/dbus-1. It's purer to use a
command-line argument when starting the system bus daemon, but
  unfortunately dbus-daemon-launch-helper is started with an empty
  environment and no way to override the compile-time location of the
  configuration file.

  I've made a temporary copy of dbus since lots of things depend on it
  and I don't want a big recompile.

svn path=/nixpkgs/trunk/; revision=16735
2009-08-16 21:44:07 +00:00
Eelco Dolstra
17132958a9 * dbus: updated to 1.2.16.
svn path=/nixpkgs/trunk/; revision=16683
2009-08-11 20:58:05 +00:00
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Eelco Dolstra
01fdf66360 * Turning on nullglob revealed an unintended wildcard expansion in
dbus' patchPhase.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15139
2009-04-19 08:54:11 +00:00
Eelco Dolstra
6211cf4c0c * dbus-tools: purity fix (don't try to create /var).
svn path=/nixpkgs/trunk/; revision=13638
2008-12-15 23:45:52 +00:00
Marc Weber
84db2ea357 dbus update
svn path=/nixpkgs/trunk/; revision=13549
2008-12-02 12:27:27 +00:00
Eelco Dolstra
f2f87036ce * Revert to DBus 1.0.2; 1.1.20 is broken, it kills the X server when
you restart the daemon (http://bugs.gentoo.org/show_bug.cgi?id=206509).

svn path=/nixpkgs/trunk/; revision=10984
2008-03-06 13:02:04 +00:00
Eelco Dolstra
c65fa45df9 * Fix building when /var/lib/dbus doesn't exist.
svn path=/nixpkgs/trunk/; revision=10963
2008-03-05 14:37:06 +00:00
Eelco Dolstra
167aa686ee * DBus 1.1.20.
svn path=/nixpkgs/trunk/; revision=10945
2008-03-04 13:30:34 +00:00
Michael Raskin
c264b316b1 Some updates. Now I can build system at least with some settings.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10551
2008-02-08 10:39:20 +00:00
Yury G. Kudryashov
e0d1a17680 dbus: fixed a typo
svn path=/nixpkgs/branches/stdenv-updates/; revision=10466
2008-02-02 20:42:36 +00:00
Yury G. Kudryashov
aa4d93482d D-Bus splitted into two packages: dbus.libs and dbus.tools
svn path=/nixpkgs/branches/stdenv-updates/; revision=10461
2008-02-02 20:41:06 +00:00
Eelco Dolstra
80c7cce4e9 * Use /var.
svn path=/nixpkgs/trunk/; revision=8836
2007-06-05 16:56:10 +00:00
Eelco Dolstra
c096988e57 * Don't check for X.
svn path=/nixpkgs/trunk/; revision=8174
2007-03-04 23:48:05 +00:00
Eelco Dolstra
295990ca07 * gconf-editor and various dependencies.
svn path=/nixpkgs/trunk/; revision=8171
2007-03-04 21:28:24 +00:00