diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 15:09:19 +0100 |
commit | b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf (patch) | |
tree | 220c385a8657d85bb6b305819a1842a3b1f4079c /pkgs/development/libraries/pipewire/pipewire-pulse-path.patch | |
parent | 977848375167f4671a03ccc0dbf5896f4cf0d3fe (diff) | |
parent | be36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff) | |
download | nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.gz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.bz2 nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.lz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.xz nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.tar.zst nixpkgs-b2a3891e12777fa5e16bc93bc95c0d5ba256ebaf.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/pipewire/pipewire-pulse-path.patch')
-rw-r--r-- | pkgs/development/libraries/pipewire/pipewire-pulse-path.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch b/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch new file mode 100644 index 00000000000..6ac86b111ee --- /dev/null +++ b/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch @@ -0,0 +1,24 @@ +diff --git a/meson_options.txt b/meson_options.txt +index 4b9e46b8..9d73ed06 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -147,3 +147,6 @@ option('pw-cat', + option('udevrulesdir', + type : 'string', + description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') ++option('pipewire_pulse_prefix', ++ type : 'string', ++ description : 'Install directory for the pipewire-pulse daemon') +diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build +index 29fc93d4..f78946f2 100644 +--- a/src/daemon/systemd/user/meson.build ++++ b/src/daemon/systemd/user/meson.build +@@ -6,7 +6,7 @@ install_data( + + systemd_config = configuration_data() + systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire')) +-systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse')) ++systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse')) + + configure_file(input : 'pipewire.service.in', + output : 'pipewire.service', |