From d21d0d89a55af491bfc7b9f3a142554a4d7ec8be Mon Sep 17 00:00:00 2001
From: Patrick Gaskin <patrick@pgaskin.net>
Date: Thu, 22 Apr 2021 09:04:43 -0400
Subject: [PATCH] build-sys: meson: Merge system_conf config data from
 default_conf

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/547>
---
 src/daemon/meson.build | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index 42bf59e..e19b290 100644
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -121,9 +121,7 @@ custom_target('default.pa',
 )
 
 system_conf = configuration_data()
-system_conf.merge_from(cdata)
-system_conf.set('PA_BINARY', cdata.get_unquoted('PA_BINARY'))
-system_conf.set('PA_SOEXT', cdata.get_unquoted('PA_SOEXT'))
+system_conf.merge_from(default_conf)
 
 system_template_file = configure_file(
   input : 'system.pa.in',
-- 
2.7.4