diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-05 13:38:16 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-05 13:45:59 +0200 |
| commit | ba70ce28ae4032a4674634c2a00615f7a0908357 (patch) | |
| tree | f6457cffcba8b8c9a066471f09677130b310d459 /nixos/modules/services/system/dbus.nix | |
| parent | d94c072f8ed20045015fd80cc10ad8ac64a35dc7 (diff) | |
| download | nixpkgs-ba70ce28ae4032a4674634c2a00615f7a0908357.tar nixpkgs-ba70ce28ae4032a4674634c2a00615f7a0908357.tar.gz nixpkgs-ba70ce28ae4032a4674634c2a00615f7a0908357.tar.bz2 nixpkgs-ba70ce28ae4032a4674634c2a00615f7a0908357.tar.lz nixpkgs-ba70ce28ae4032a4674634c2a00615f7a0908357.tar.xz nixpkgs-ba70ce28ae4032a4674634c2a00615f7a0908357.tar.zst nixpkgs-ba70ce28ae4032a4674634c2a00615f7a0908357.zip | |
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.
Diffstat (limited to 'nixos/modules/services/system/dbus.nix')
| -rw-r--r-- | nixos/modules/services/system/dbus.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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; |