From eae9551832f9444187350d981a555a8c276365c3 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Sun, 12 Sep 2021 16:33:50 +0300 Subject: [PATCH 1/2] pipewire: 0.3.34 -> 0.3.35 (cherry picked from commit f4fbb211765c265203004014e63a4e149520f6b9) --- .../pipewire/bluez-hardware.conf.json | 29 ++++++++----------- .../0090-pipewire-config-template-paths.patch | 14 ++++----- .../libraries/pipewire/default.nix | 4 +-- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json index 46697ece448..a02cf13aa65 100644 --- a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json +++ b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json @@ -33,6 +33,13 @@ "hw-volume" ] }, + { + "name": "D50s", + "address": "~^00:13:ef:", + "no-features": [ + "hw-volume" + ] + }, { "name": "JBL Endurance RUN BT", "no-features": [ @@ -191,47 +198,35 @@ }, { "sysname": "Linux", - "release": "~^5\\.(8|9|10)\\.", + "release": "~^5\\.(8|9)\\.", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "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])" - }, - { - "sysname": "Linux", - "release": "~^5\\.10\\.", + "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])", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "release": "~^5\\.12\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17)($|[^0-9])" - }, - { - "sysname": "Linux", - "release": "~^5\\.12\\.", + "release": "~^5\\.12\\.(18|19)($|[^0-9])", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "release": "~^5\\.13\\.(1|2)($|[^0-9])" - }, - { - "sysname": "Linux", - "release": "~^5\\.13\\.", + "release": "~^5\\.13\\.(3|4|5|6|7|8|9|10|11|12|13)($|[^0-9])", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "release": "~^5\\.14\\.", + "release": "~^5\\.14($|[^0-9])", "no-features": [ "msbc-alt1" ] diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch index 1f1a98780e9..d3851604a13 100644 --- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index bbafa134..227d3e06 100644 +index 95632c250..a88aac6e2 100644 --- a/src/daemon/pipewire.conf.in +++ b/src/daemon/pipewire.conf.in -@@ -116,7 +116,7 @@ context.modules = [ +@@ -131,7 +131,7 @@ context.modules = [ # access.allowed to list an array of paths of allowed # apps. #access.allowed = [ @@ -11,18 +11,18 @@ index bbafa134..227d3e06 100644 #] # An array of rejected paths. -@@ -220,12 +220,12 @@ context.exec = [ +@@ -235,12 +235,12 @@ context.exec = [ # but it is better to start it as a systemd service. # Run the session manager with -h for options. # -- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } -+ @comment@{ path = "" args = "@session_manager_args@" } +- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } ++ @sm_comment@{ path = "" args = "@session_manager_args@" } # # You can optionally start the pulseaudio-server here as well # but it is better to start it as a systemd service. # It can be interesting to start another daemon here that listens # on another address with the -a option (eg. -a tcp:4713). # -- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ @comment@{ path = "" args = "-c pipewire-pulse.conf" } +- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } ++ @pulse_comment@{ path = "" args = "-c pipewire-pulse.conf" } ] diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 1528d0a3b96..6e7651000c0 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -57,7 +57,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.34"; + version = "0.3.35"; outputs = [ "out" @@ -75,7 +75,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-ZFARA7YuDnpObGLWbgy1Rk+wzmAxHEMuHQkb6tWD0s0="; + sha256 = "sha256-cGH0Hd4c4KLyynMb3LIwElwHD99apNiI40SwZC3KG/s="; }; patches = [ From 66528906a5675b5968bf0cb5fefb73532a9a52a9 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Sun, 12 Sep 2021 18:24:25 +0300 Subject: [PATCH 2/2] pipewire: enable manpages (cherry picked from commit 044da009d172482fc8b748bcc92cced3c915bb0e) --- pkgs/development/libraries/pipewire/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 6e7651000c0..0481304997f 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -7,6 +7,7 @@ , ninja , systemd , pkg-config +, docutils , doxygen , graphviz , valgrind @@ -66,6 +67,7 @@ let "jack" "dev" "doc" + "man" "mediaSession" "installedTests" ]; @@ -94,6 +96,7 @@ let ]; nativeBuildInputs = [ + docutils doxygen graphviz meson @@ -125,7 +128,6 @@ let mesonFlags = [ "-Ddocs=enabled" - "-Dman=disabled" # we don't have xmltoman "-Dexamples=${mesonEnable withMediaSession}" # only needed for `pipewire-media-session` "-Dudevrulesdir=lib/udev/rules.d" "-Dinstalled_tests=enabled"