summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-05 13:38:16 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-05 13:45:59 +0200
commitba70ce28ae4032a4674634c2a00615f7a0908357 (patch)
treef6457cffcba8b8c9a066471f09677130b310d459 /pkgs
parentd94c072f8ed20045015fd80cc10ad8ac64a35dc7 (diff)
downloadnixlib-ba70ce28ae4032a4674634c2a00615f7a0908357.tar
nixlib-ba70ce28ae4032a4674634c2a00615f7a0908357.tar.gz
nixlib-ba70ce28ae4032a4674634c2a00615f7a0908357.tar.bz2
nixlib-ba70ce28ae4032a4674634c2a00615f7a0908357.tar.lz
nixlib-ba70ce28ae4032a4674634c2a00615f7a0908357.tar.xz
nixlib-ba70ce28ae4032a4674634c2a00615f7a0908357.tar.zst
nixlib-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 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3aaf9e62f667..6399ef8703b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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-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_libs = self.dbus;
   dbus_daemon = self.dbus.daemon;