git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #137533 from jansol/master

pipewire: 0.3.34 -> 0.3.35

commit79c444b5bdeaba142d128afddee14c89ecf2a968 authorJan Tojnar <jtojnar@gmail.com> dateThu 16 Sep 2021, 11:44 (5 years ago) parent29595eb044da00
3 files changed+24−27
compare with master
unifiedsplit
nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json+12−17 pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch+7−7 pkgs/development/libraries/pipewire/default.nix+5−3
nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json+12−17
@@ -33,6 +33,13 @@
3333 "hw-volume"
3434 ]
3535 },
36+ {
37+ "name": "D50s",
38+ "address": "~^00:13:ef:",
39+ "no-features": [
40+ "hw-volume"
41+ ]
42+ },
3643 {
3744 "name": "JBL Endurance RUN BT",
3845 "no-features": [
@@ -191,47 +198,35 @@
191198 },
192199 {
193200 "sysname": "Linux",
194− "release": "~^5\\.(8|9|10)\\.",
201+ "release": "~^5\\.(8|9)\\.",
195202 "no-features": [
196203 "msbc-alt1"
197204 ]
198205 },
199206 {
200207 "sysname": "Linux",
201− "release": "~^5\\.10\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50)($|[^0-9])"
202− },
203− {
204− "sysname": "Linux",
205− "release": "~^5\\.10\\.",
208+ "release": "~^5\\.10\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|51|52|53|54|55|56|57|58|59|60|61)($|[^0-9])",
206209 "no-features": [
207210 "msbc-alt1"
208211 ]
209212 },
210213 {
211214 "sysname": "Linux",
212− "release": "~^5\\.12\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17)($|[^0-9])"
213− },
214− {
215− "sysname": "Linux",
216− "release": "~^5\\.12\\.",
215+ "release": "~^5\\.12\\.(18|19)($|[^0-9])",
217216 "no-features": [
218217 "msbc-alt1"
219218 ]
220219 },
221220 {
222221 "sysname": "Linux",
223− "release": "~^5\\.13\\.(1|2)($|[^0-9])"
224− },
225− {
226− "sysname": "Linux",
227− "release": "~^5\\.13\\.",
222+ "release": "~^5\\.13\\.(3|4|5|6|7|8|9|10|11|12|13)($|[^0-9])",
228223 "no-features": [
229224 "msbc-alt1"
230225 ]
231226 },
232227 {
233228 "sysname": "Linux",
234− "release": "~^5\\.14\\.",
229+ "release": "~^5\\.14($|[^0-9])",
235230 "no-features": [
236231 "msbc-alt1"
237232 ]
pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch+7−7
@@ -1,8 +1,8 @@
11diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
2−index bbafa134..227d3e06 100644
2+index 95632c250..a88aac6e2 100644
33--- a/src/daemon/pipewire.conf.in
44+++ b/src/daemon/pipewire.conf.in
5−@@ -116,7 +116,7 @@ context.modules = [
5+@@ -131,7 +131,7 @@ context.modules = [
66 # access.allowed to list an array of paths of allowed
77 # apps.
88 #access.allowed = [
@@ -11,18 +11,18 @@ index bbafa134..227d3e06 100644
1111 #]
1212
1313 # An array of rejected paths.
14−@@ -220,12 +220,12 @@ context.exec = [
14+@@ -235,12 +235,12 @@ context.exec = [
1515 # but it is better to start it as a systemd service.
1616 # Run the session manager with -h for options.
1717 #
18−- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
19−+ @comment@{ path = "<session_manager_path>" args = "@session_manager_args@" }
18+- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
19++ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@" }
2020 #
2121 # You can optionally start the pulseaudio-server here as well
2222 # but it is better to start it as a systemd service.
2323 # It can be interesting to start another daemon here that listens
2424 # on another address with the -a option (eg. -a tcp:4713).
2525 #
26−- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
27−+ @comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" }
26+- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
27++ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" }
2828 ]
pkgs/development/libraries/pipewire/default.nix+5−3
@@ -7,6 +7,7 @@
77, ninja
88, systemd
99, pkg-config
10+, docutils
1011, doxygen
1112, graphviz
1213, valgrind
@@ -57,7 +58,7 @@ let
5758
5859 self = stdenv.mkDerivation rec {
5960 pname = "pipewire";
60− version = "0.3.34";
61+ version = "0.3.35";
6162
6263 outputs = [
6364 "out"
@@ -66,6 +67,7 @@ let
6667 "jack"
6768 "dev"
6869 "doc"
70+ "man"
6971 "mediaSession"
7072 "installedTests"
7173 ];
@@ -75,7 +77,7 @@ let
7577 owner = "pipewire";
7678 repo = "pipewire";
7779 rev = version;
78− sha256 = "sha256-ZFARA7YuDnpObGLWbgy1Rk+wzmAxHEMuHQkb6tWD0s0=";
80+ sha256 = "sha256-cGH0Hd4c4KLyynMb3LIwElwHD99apNiI40SwZC3KG/s=";
7981 };
8082
8183 patches = [
@@ -94,6 +96,7 @@ let
9496 ];
9597
9698 nativeBuildInputs = [
99+ docutils
97100 doxygen
98101 graphviz
99102 meson
@@ -125,7 +128,6 @@ let
125128
126129 mesonFlags = [
127130 "-Ddocs=enabled"
128− "-Dman=disabled" # we don't have xmltoman
129131 "-Dexamples=${mesonEnable withMediaSession}" # only needed for `pipewire-media-session`
130132 "-Dudevrulesdir=lib/udev/rules.d"
131133 "-Dinstalled_tests=enabled"