From 2c39a011c756c94c019031696dd3032f4977ce28 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 29 Nov 2020 19:19:59 +0100
Subject: [PATCH] pipewire: look for configuration in /etc

---
 .../libraries/pipewire/default.nix            |  3 ++
 .../pipewire/pipewire-config-dir.patch        | 30 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/pipewire/pipewire-config-dir.patch

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 9347b7674cf0..d07c77f4e2eb 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -66,6 +66,8 @@ stdenv.mkDerivation rec {
     ./installed-tests-path.patch
     # Change the path of the pipewire-pulse binary in the service definition.
     ./pipewire-pulse-path.patch
+    # Add flag to specify configuration directory (different from the installation directory).
+    ./pipewire-config-dir.patch
   ];
 
   nativeBuildInputs = [
@@ -106,6 +108,7 @@ stdenv.mkDerivation rec {
     "-Dbluez5-backend-native=${mesonBool nativeHspSupport}"
     "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}"
     "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}"
+    "-Dpipewire_config_dir=/etc/pipewire"
   ];
 
   FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
diff --git a/pkgs/development/libraries/pipewire/pipewire-config-dir.patch b/pkgs/development/libraries/pipewire/pipewire-config-dir.patch
new file mode 100644
index 000000000000..ad1ae93684b1
--- /dev/null
+++ b/pkgs/development/libraries/pipewire/pipewire-config-dir.patch
@@ -0,0 +1,30 @@
+diff --git a/meson.build b/meson.build
+index 0073eb13..0ffc6863 100644
+--- a/meson.build
++++ b/meson.build
+@@ -34,7 +34,10 @@ pipewire_libexecdir = join_paths(prefix, get_option('libexecdir'))
+ pipewire_localedir = join_paths(prefix, get_option('localedir'))
+ pipewire_sysconfdir = join_paths(prefix, get_option('sysconfdir'))
+ 
+-pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire')
++pipewire_configdir = get_option('pipewire_config_dir')
++if pipewire_configdir == ''
++  pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire')
++endif
+ modules_install_dir = join_paths(pipewire_libdir, pipewire_name)
+ 
+ if host_machine.system() == 'linux'
+diff --git a/meson_options.txt b/meson_options.txt
+index 4b9e46b8..8c301459 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -56,6 +56,9 @@ option('pipewire-pulseaudio',
+ option('libpulse-path',
+        description: 'Where to install the libpulse.so library',
+        type: 'string')
++option('pipewire_config_dir',
++       type : 'string',
++       description : 'Directory for pipewire configuration (defaults to /etc/pipewire)')
+ option('spa-plugins',
+        description: 'Enable spa plugins integration',
+        type: 'boolean',