From ba70ce28ae4032a4674634c2a00615f7a0908357 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2016 13:38:16 +0200 Subject: no-x-libs.nix: Ensure that dbus doesn't use X11 It appears that packageOverrides no longer overrides aliases, so aliases like dbus_tools = self.dbus.out; dbus_daemon = self.dbus.daemon; now use the old, non-overriden version of dbus. That seems like a pretty serious regression in general, but for this particular problem, I've fixed it by replacing dbus_daemon by dbus.daemon and dbus_tools by dbus. --- nixos/modules/services/system/dbus.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules/services/system/dbus.nix') diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 8bcd6f01656..6c4833afbe8 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -84,7 +84,7 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus_tools ]; + environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ]; environment.etc = singleton { source = configDir; @@ -104,7 +104,7 @@ in security.setuidOwners = singleton { program = "dbus-daemon-launch-helper"; - source = "${pkgs.dbus_daemon.out}/libexec/dbus-daemon-launch-helper"; + source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper"; owner = "root"; group = "messagebus"; setuid = true; -- cgit 1.4.1