Merge pull request #147997 from oxalica/fix/pipewire-valgrind

This commit is contained in:
Sandro 2021-12-18 09:53:13 +01:00 committed by GitHub
commit ca3c836d08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -10,7 +10,6 @@
, docutils
, doxygen
, graphviz
, valgrind
, glib
, dbus
, alsa-lib
@ -28,28 +27,30 @@
, makeFontsConf
, callPackage
, nixosTests
, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind
, valgrind
, withMediaSession ? true
, libcameraSupport ? true
, libcamera
, libdrm
, gstreamerSupport ? true
, gst_all_1 ? null
, gst_all_1
, ffmpegSupport ? true
, ffmpeg ? null
, ffmpeg
, bluezSupport ? true
, bluez ? null
, sbc ? null
, libfreeaptx ? null
, ldacbt ? null
, fdk_aac ? null
, bluez
, sbc
, libfreeaptx
, ldacbt
, fdk_aac
, nativeHspSupport ? true
, nativeHfpSupport ? true
, ofonoSupport ? true
, hsphfpdSupport ? true
, pulseTunnelSupport ? true
, libpulseaudio ? null
, libpulseaudio
, zeroconfSupport ? true
, avahi ? null
, avahi
}:
let
@ -121,7 +122,6 @@ let
vulkan-headers
vulkan-loader
webrtc-audio-processing
valgrind
SDL2
systemd
] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ]
@ -131,6 +131,9 @@ let
++ lib.optional pulseTunnelSupport libpulseaudio
++ lib.optional zeroconfSupport avahi;
# Valgrind binary is required for running one optional test.
checkInputs = lib.optional withValgrind valgrind;
mesonFlags = [
"-Ddocs=enabled"
"-Dudevrulesdir=lib/udev/rules.d"