public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no-x-libs.nix: Ensure that dbus doesn't use X11

Browse Source 
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.
This commit is contained in:
Eelco Dolstra 2016-09-05 13:38:16 +02:00
parent d94c072f8e
commit ba70ce28ae
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/system/dbus.nix
View File

@ -84,7 +84,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus_tools ]; environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ];
environment.etc = singleton environment.etc = singleton
{ source = configDir; { source = configDir;
@ -104,7 +104,7 @@ in
security.setuidOwners = singleton security.setuidOwners = singleton
{ program = "dbus-daemon-launch-helper"; { 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"; owner = "root";
group = "messagebus"; group = "messagebus";
setuid = true; setuid = true;

2
pkgs/top-level/all-packages.nix
View File

@ -7139,7 +7139,7 @@ in
dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { }; dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { };
dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { };
# Should we deprecate these? Currently there are many references. # FIXME: deprecate these.
dbus_tools = self.dbus.out; dbus_tools = self.dbus.out;
dbus_libs = self.dbus; dbus_libs = self.dbus;
dbus_daemon = self.dbus.daemon; dbus_daemon = self.dbus.daemon;