diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-10-02 19:10:07 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-10-02 19:13:38 +0100 |
| commit | 31c87e7d7794cb5e1a755a70721852f64ebbdef0 (patch) | |
| tree | 483bb209fa77558e05160ea7e6a4ee813c0b5f2c | |
| parent | 465f68a5af0289a913a3a8aff41549b501695825 (diff) | |
| download | nixpkgs-31c87e7d7794cb5e1a755a70721852f64ebbdef0.tar nixpkgs-31c87e7d7794cb5e1a755a70721852f64ebbdef0.tar.gz nixpkgs-31c87e7d7794cb5e1a755a70721852f64ebbdef0.tar.bz2 nixpkgs-31c87e7d7794cb5e1a755a70721852f64ebbdef0.tar.lz nixpkgs-31c87e7d7794cb5e1a755a70721852f64ebbdef0.tar.xz nixpkgs-31c87e7d7794cb5e1a755a70721852f64ebbdef0.tar.zst nixpkgs-31c87e7d7794cb5e1a755a70721852f64ebbdef0.zip | |
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.
| -rw-r--r-- | pkgs/servers/pulseaudio/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 6b09105ef20..f1fc2a3573b 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 |