dbus: remove broken X11 autolaunch hack
This hack was added so that X11 autolaunch support could be enabled even when building without X11. At the time, it was possible to have the autolaunch support without X11 support. But later, this stopped being possible, and so the derivation was changed to only apply the hack when X11 support was enabled. But in that case, the same flag would be added by the build system. So in summary, this hack is only enabled in the case where it's a no-op. Therefore, it can be safely removed.
This commit is contained in:
parent
8f10fcb5ba
commit
f7d585f7ca
1 changed files with 0 additions and 4 deletions
|
@ -86,10 +86,6 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optional (!x11Support) "--without-x"
|
||||
++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ];
|
||||
|
||||
# Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
|
||||
# (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
|
||||
# problems building without x11Support so disabled in that case for now
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
|
||||
NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
Loading…
Reference in a new issue