git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #120833 from talyz/pipewire-0.3.26

pipewire: 0.3.25 -> 0.3.26

commitabecdfea738e9be0f375f9d9019ed52b293f82d2 authorKim Lindberger <kim.lindberger@gmail.com> dateThu 29 Apr 2021, 18:46 (6 years ago) parent7f9a5adfb86d32
14 files changed+115−78
nixos/modules/services/desktops/pipewire/README.md−6 nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json+1−1 nixos/modules/services/desktops/pipewire/media-session.conf.json+1 nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json+4−1 nixos/modules/services/desktops/pipewire/pipewire.conf.json+4−1 nixos/tests/installed-tests/pipewire.nix+10 pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch+6−6 pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch+7−7 pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch+8−8 pkgs/development/libraries/pipewire/0070-installed-tests-path.patch+10−10 pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch+12−12 pkgs/development/libraries/pipewire/default.nix+27−25 pkgs/development/libraries/pipewire/test-paths.nix+1−1 pkgs/development/libraries/pipewire/update.sh+24
nixos/modules/services/desktops/pipewire/README.mddeleted−6
@@ -1,6 +0,0 @@
1−# Updating
2−
3−1. Update the version & hash in pkgs/development/libraries/pipewire/default.nix
4−2. run `nix build -f /path/to/nixpkgs/checkout pipewire pipewire.mediaSession`
5−3. copy all JSON files from result/etc/pipewire and result-mediaSession/etc/pipewire/media-session.d to this directory
6−4. add new files to the module config and passthru tests
nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json+1−1
@@ -9,7 +9,7 @@
99 ],
1010 "actions": {
1111 "update-props": {
12− "bluez5.reconnect-profiles": [
12+ "bluez5.auto-connect": [
1313 "hfp_hf",
1414 "hsp_hs",
1515 "a2dp_sink"
nixos/modules/services/desktops/pipewire/media-session.conf.json+1
@@ -59,6 +59,7 @@
5959 "with-pulseaudio": [
6060 "with-audio",
6161 "bluez5",
62+ "logind",
6263 "restore-stream",
6364 "streams-follow-default"
6465 ]
nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json+4−1
@@ -30,7 +30,10 @@
3030 "args": {
3131 "server.address": [
3232 "unix:native"
33− ]
33+ ],
34+ "vm.overrides": {
35+ "pulse.min.quantum": "1024/48000"
36+ }
3437 }
3538 }
3639 ],
nixos/modules/services/desktops/pipewire/pipewire.conf.json+4−1
@@ -2,7 +2,10 @@
22 "context.properties": {
33 "link.max-buffers": 16,
44 "core.daemon": true,
5− "core.name": "pipewire-0"
5+ "core.name": "pipewire-0",
6+ "vm.overrides": {
7+ "default.clock.min-quantum": 1024
8+ }
69 },
710 "context.spa-libs": {
811 "audio.convert.*": "audioconvert/libspa-audioconvert",
nixos/tests/installed-tests/pipewire.nix+10
@@ -2,4 +2,14 @@
22
33makeInstalledTest {
44 tested = pkgs.pipewire;
5+ testConfig = {
6+ hardware.pulseaudio.enable = false;
7+ services.pipewire = {
8+ enable = true;
9+ pulse.enable = true;
10+ jack.enable = true;
11+ alsa.enable = true;
12+ alsa.support32Bit = true;
13+ };
14+ };
515}
pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch+6−6
@@ -1,13 +1,13 @@
11diff --git a/meson.build b/meson.build
2−index ffee41b4..f3e4ec74 100644
2+index 99a4b2d1..d4a4cda7 100644
33--- a/meson.build
44+++ b/meson.build
5−@@ -53,7 +53,7 @@ endif
5+@@ -55,7 +55,7 @@ endif
66
7− spa_plugindir = join_paths(pipewire_libdir, spa_name)
7+ spa_plugindir = pipewire_libdir / spa_name
88
9−-alsadatadir = join_paths(pipewire_datadir, 'alsa-card-profile', 'mixer')
10−+alsadatadir = join_paths(pipewire_libdir, '..', 'share', 'alsa-card-profile', 'mixer')
9+-alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer'
10++alsadatadir = pipewire_libdir / '..' / 'share' / 'alsa-card-profile' / 'mixer'
1111
12− pipewire_headers_dir = join_paths(pipewire_name, 'pipewire')
12+ pipewire_headers_dir = pipewire_name / 'pipewire'
1313
pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch+7−7
@@ -1,8 +1,8 @@
11diff --git a/meson_options.txt b/meson_options.txt
2−index ce364d93..a6c8af72 100644
2+index 66791f3a..93b5e2a9 100644
33--- a/meson_options.txt
44+++ b/meson_options.txt
5−@@ -152,6 +152,9 @@ option('udev',
5+@@ -172,6 +172,9 @@ option('udev',
66 option('udevrulesdir',
77 type : 'string',
88 description : 'Directory for udev rules (defaults to /lib/udev/rules.d)')
@@ -13,15 +13,15 @@ index ce364d93..a6c8af72 100644
1313 type : 'string',
1414 description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)')
1515diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
16−index 0a5e5042..4a70b0b0 100644
16+index aa30a86f..1edebb2d 100644
1717--- a/src/daemon/systemd/user/meson.build
1818+++ b/src/daemon/systemd/user/meson.build
1919@@ -9,7 +9,7 @@ install_data(
2020
2121 systemd_config = configuration_data()
22− systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))
23−-systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse'))
24−+systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse'))
25− systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))
22+ systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire')
23+-systemd_config.set('PW_PULSE_BINARY', pipewire_bindir / 'pipewire-pulse')
24++systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse')
25+ systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session')
2626
2727 configure_file(input : 'pipewire.service.in',
pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch+8−8
@@ -1,8 +1,8 @@
11diff --git a/meson_options.txt b/meson_options.txt
2−index e2a1e028..310029f2 100644
2+index 93b5e2a9..1b915ac3 100644
33--- a/meson_options.txt
44+++ b/meson_options.txt
5−@@ -10,6 +10,9 @@ option('media-session',
5+@@ -13,6 +13,9 @@ option('media-session',
66 description: 'Build and install pipewire-media-session',
77 type: 'feature',
88 value: 'auto')
@@ -13,15 +13,15 @@ index e2a1e028..310029f2 100644
1313 description: 'Build manpages',
1414 type: 'feature',
1515diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
16−index 5c4d1af0..7296220f 100644
16+index 1edebb2d..251270eb 100644
1717--- a/src/daemon/systemd/user/meson.build
1818+++ b/src/daemon/systemd/user/meson.build
1919@@ -10,7 +10,7 @@ install_data(
2020 systemd_config = configuration_data()
21− systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire'))
22− systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse'))
23−-systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(pipewire_bindir, 'pipewire-media-session'))
24−+systemd_config.set('PW_MEDIA_SESSION_BINARY', join_paths(get_option('media-session-prefix'), 'bin/pipewire-media-session'))
25−
21+ systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire')
22+ systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse')
23+-systemd_config.set('PW_MEDIA_SESSION_BINARY', pipewire_bindir / 'pipewire-media-session')
24++systemd_config.set('PW_MEDIA_SESSION_BINARY', get_option('media-session-prefix') / 'bin/pipewire-media-session')
25+
2626 configure_file(input : 'pipewire.service.in',
2727 output : 'pipewire.service',
pkgs/development/libraries/pipewire/0070-installed-tests-path.patch+10−10
@@ -1,23 +1,23 @@
11diff --git a/meson.build b/meson.build
2−index 97d4d939..b17358e5 100644
2+index d4a4cda7..a27569bd 100644
33--- a/meson.build
44+++ b/meson.build
55@@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd'
6−
6+
77 alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa'))
8−
9−-installed_tests_metadir = join_paths(pipewire_datadir, 'installed-tests', pipewire_name)
10−-installed_tests_execdir = join_paths(pipewire_libexecdir, 'installed-tests', pipewire_name)
11−+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', pipewire_name)
12−+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', pipewire_name)
8+
9+-installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name
10+-installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name
11++installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / pipewire_name
12++installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / pipewire_name
1313 installed_tests_enabled = not get_option('installed_tests').disabled()
1414 installed_tests_template = files('template.test.in')
15−
15+
1616diff --git a/meson_options.txt b/meson_options.txt
17−index fba0d647..8c6106cd 100644
17+index 1b915ac3..85beb86a 100644
1818--- a/meson_options.txt
1919+++ b/meson_options.txt
20−@@ -26,6 +26,9 @@ option('installed_tests',
20+@@ -29,6 +29,9 @@ option('installed_tests',
2121 description: 'Install manual and automated test executables',
2222 type: 'feature',
2323 value: 'disabled')
pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch+12−12
@@ -1,30 +1,30 @@
11diff --git a/meson.build b/meson.build
2−index 0073eb13..0ffc6863 100644
2+index a27569bd..fcf18344 100644
33--- a/meson.build
44+++ b/meson.build
5−@@ -34,7 +34,10 @@ pipewire_libexecdir = join_paths(prefix, get_option('libexecdir'))
6− pipewire_localedir = join_paths(prefix, get_option('localedir'))
7− pipewire_sysconfdir = join_paths(prefix, get_option('sysconfdir'))
5+@@ -36,7 +36,10 @@ pipewire_libexecdir = prefix / get_option('libexecdir')
6+ pipewire_localedir = prefix / get_option('localedir')
7+ pipewire_sysconfdir = prefix / get_option('sysconfdir')
88
9−-pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire')
9+-pipewire_configdir = pipewire_sysconfdir / 'pipewire'
1010+pipewire_configdir = get_option('pipewire_config_dir')
1111+if pipewire_configdir == ''
12−+ pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire')
12++ pipewire_configdir = pipewire_sysconfdir / 'pipewire'
1313+endif
14− modules_install_dir = join_paths(pipewire_libdir, pipewire_name)
14+ modules_install_dir = pipewire_libdir / pipewire_name
1515
1616 if host_machine.system() == 'linux'
1717diff --git a/meson_options.txt b/meson_options.txt
18−index 4b9e46b8..8c301459 100644
18+index 85beb86a..372e8faa 100644
1919--- a/meson_options.txt
2020+++ b/meson_options.txt
21−@@ -56,6 +56,9 @@ option('pipewire-pulseaudio',
22− option('libpulse-path',
23− description: 'Where to install the libpulse.so library',
21+@@ -67,6 +67,9 @@ option('jack-devel',
22+ option('libjack-path',
23+ description: 'Where to install the libjack.so library',
2424 type: 'string')
2525+option('pipewire_config_dir',
2626+ type : 'string',
2727+ description : 'Directory for pipewire configuration (defaults to /etc/pipewire)')
2828 option('spa-plugins',
2929 description: 'Enable spa plugins integration',
30− type: 'boolean',
30+ type: 'feature',
pkgs/development/libraries/pipewire/default.nix+27−25
@@ -42,7 +42,7 @@ let
4242
4343 self = stdenv.mkDerivation rec {
4444 pname = "pipewire";
45− version = "0.3.25";
45+ version = "0.3.26";
4646
4747 outputs = [
4848 "out"
@@ -60,7 +60,7 @@ let
6060 owner = "pipewire";
6161 repo = "pipewire";
6262 rev = version;
63− hash = "sha256:EbXWcf6QLtbvm6/eXBI+PF2sTw2opYfmc+H/SMDEH1U=";
63+ sha256 = "sha256-s9+70XXMN4K3yDVwIu+L15gL6rFlpRNVQpeekZQOEec=";
6464 };
6565
6666 patches = [
@@ -146,29 +146,31 @@ let
146146 moveToOutput "bin/pipewire-pulse" "$pulse"
147147 '';
148148
149− passthru.tests = {
150− installedTests = nixosTests.installed-tests.pipewire;
151−
152− # This ensures that all the paths used by the NixOS module are found.
153− test-paths = callPackage ./test-paths.nix {
154− paths-out = [
155− "share/alsa/alsa.conf.d/50-pipewire.conf"
156− "nix-support/etc/pipewire/client.conf.json"
157− "nix-support/etc/pipewire/client-rt.conf.json"
158− "nix-support/etc/pipewire/jack.conf.json"
159− "nix-support/etc/pipewire/pipewire.conf.json"
160− "nix-support/etc/pipewire/pipewire-pulse.conf.json"
161− ];
162− paths-out-media-session = [
163− "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json"
164− "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json"
165− "nix-support/etc/pipewire/media-session.d/media-session.conf.json"
166− "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json"
167− ];
168− paths-lib = [
169− "lib/alsa-lib/libasound_module_pcm_pipewire.so"
170− "share/alsa-card-profile/mixer"
171− ];
149+ passthru = {
150+ updateScript = ./update.sh;
151+ tests = {
152+ installedTests = nixosTests.installed-tests.pipewire;
153+
154+ # This ensures that all the paths used by the NixOS module are found.
155+ test-paths = callPackage ./test-paths.nix {
156+ paths-out = [
157+ "share/alsa/alsa.conf.d/50-pipewire.conf"
158+ "nix-support/etc/pipewire/client.conf.json"
159+ "nix-support/etc/pipewire/jack.conf.json"
160+ "nix-support/etc/pipewire/pipewire.conf.json"
161+ "nix-support/etc/pipewire/pipewire-pulse.conf.json"
162+ ];
163+ paths-out-media-session = [
164+ "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json"
165+ "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json"
166+ "nix-support/etc/pipewire/media-session.d/media-session.conf.json"
167+ "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json"
168+ ];
169+ paths-lib = [
170+ "lib/alsa-lib/libasound_module_pcm_pipewire.so"
171+ "share/alsa-card-profile/mixer"
172+ ];
173+ };
172174 };
173175 };
174176
pkgs/development/libraries/pipewire/test-paths.nix+1−1
@@ -1,4 +1,4 @@
1−{ lib, runCommand, pipewire, paths-out, paths-lib }:
1+{ lib, runCommand, pipewire, paths-out, paths-lib, paths-out-media-session }:
22
33let
44 check-path = output: path: ''
pkgs/development/libraries/pipewire/update.shnew file+24
@@ -0,0 +1,24 @@
1+#!/usr/bin/env nix-shell
2+#!nix-shell -p nix-update -i bash
3+# shellcheck shell=bash
4+
5+set -o errexit -o pipefail -o nounset -o errtrace
6+shopt -s inherit_errexit
7+shopt -s nullglob
8+IFS=$'\n'
9+
10+NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"
11+
12+cd "$NIXPKGS_ROOT"
13+nix-update pipewire
14+outputs=$(nix-build . -A pipewire -A pipewire.mediaSession)
15+for p in $outputs; do
16+ conf_files=$(find "$p/nix-support/etc/pipewire/" -name '*.conf.json')
17+ for c in $conf_files; do
18+ file_name=$(basename "$c")
19+ if [[ ! -e "nixos/modules/services/desktops/pipewire/$file_name" ]]; then
20+ echo "New file $file_name found! Add it to the module config and passthru tests!"
21+ fi
22+ install -m 0644 "$c" "nixos/modules/services/desktops/pipewire/"
23+ done
24+done