Author: eelco
Date: Mon Aug 9 11:42:32 2010
New Revision: 23053
URL: https://svn.nixos.org/websvn/nix/?rev=23053&sc=1
Log:
* Always symlink etc/dbus-1 and share/dbus-1 in the system path, not
just when KDE is enabled.
Modified:
nixos/trunk/modules/services/system/dbus.nix
nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
Modified: nixos/trunk/modules/services/system/dbus.nix
==============================================================================
--- nixos/trunk/modules/services/system/dbus.nix Mon Aug 9 10:59:20
2010 (r23052)
+++ nixos/trunk/modules/services/system/dbus.nix Mon Aug 9 11:42:32
2010 (r23053)
@@ -161,6 +161,8 @@
config.system.path
];
+ environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
+
};
}
Modified: nixos/trunk/modules/services/x11/desktop-managers/kde4.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Mon Aug 9
10:59:20 2010 (r23052)
+++ nixos/trunk/modules/services/x11/desktop-managers/kde4.nix Mon Aug 9
11:42:32 2010 (r23053)
@@ -67,7 +67,7 @@
x11Packages = config.environment.kdePackages;
- pathsToLink = [ "/etc/xdg" "/etc/dbus-1" "/share" ];
+ pathsToLink = [ "/etc/xdg" "/share" ];
etc = singleton
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
