From 31c87e7d7794cb5e1a755a70721852f64ebbdef0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Oct 2022 19:10:07 +0100 Subject: [PATCH] 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. --- pkgs/servers/pulseaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 6b09105ef20a..f1fc2a3573b7 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -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