pulseaudio: use xorg.* packages directly instead of xlibsWrapper indirection

Validated as no change in `out` and `dev` outputs with diffoscope on
`pulseaudio.override { x11Support = true; }` expression.
This commit is contained in:
Sergei Trofimovich 2022-10-02 19:10:07 +01:00
parent 465f68a5af
commit 31c87e7d77

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config
, libsndfile, libtool, makeWrapper, perlPackages
, xlibsWrapper, xorg, libcap, alsa-lib, glib, dconf
, xorg, libcap, alsa-lib, glib, dconf
, avahi, libjack2, libasyncns, lirc, dbus
, sbc, bluez5, udev, openssl, fftwFloat
, soxr, speexdsp, systemd, webrtc-audio-processing
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
++ lib.optionals (!libOnly) (
[ libasyncns webrtc-audio-processing ]
++ lib.optional jackaudioSupport libjack2
++ lib.optionals x11Support [ xlibsWrapper xorg.libXtst xorg.libXi ]
++ lib.optionals x11Support [ xorg.libICE xorg.libSM xorg.libX11 xorg.libXi xorg.libXtst ]
++ lib.optional useSystemd systemd
++ lib.optionals stdenv.isLinux [ alsa-lib udev ]
++ lib.optional airtunesSupport openssl