diff options
| author | Ilan Joselevich <personal@ilanjoselevich.com> | 2021-08-26 20:29:13 +0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-09-01 14:56:15 +0000 |
| commit | 1c7d3cae8cbdd52caa9ed3edabc112383fe1f4dc (patch) | |
| tree | 96865fe3400f003462de8c23c5aa591088fcc451 | |
| parent | Merge pull request #136268 from NixOS/backport-135929-to-release-21.05 (diff) | |
| download | nixpkgs-1c7d3cae8cbdd52caa9ed3edabc112383fe1f4dc.tar.gz | |
pipewire: 0.3.33 -> 0.3.34
(cherry picked from commit 70de7b5b453f7bf4ef0e889a48b00c009338030d)
3 files changed, 31 insertions, 9 deletions
diff --git a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json index cae9e1bdba06..46697ece4483 100644 --- a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json +++ b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json @@ -198,6 +198,17 @@ }, { "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\\.", + "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])" }, { diff --git a/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json b/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json index 17bbbdef1179..3ed994f11145 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json +++ b/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json @@ -37,5 +37,6 @@ } } ], + "context.exec": [], "stream.properties": {} } diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 8988743d33e5..1528d0a3b96c 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -27,20 +27,29 @@ , callPackage , nixosTests , withMediaSession ? true -, gstreamerSupport ? true, gst_all_1 ? null -, ffmpegSupport ? true, ffmpeg ? null -, bluezSupport ? true, bluez ? null, sbc ? null, libfreeaptx ? null, ldacbt ? null, fdk_aac ? null +, gstreamerSupport ? true +, gst_all_1 ? null +, ffmpegSupport ? true +, ffmpeg ? null +, bluezSupport ? true +, bluez ? null +, sbc ? null +, libfreeaptx ? null +, ldacbt ? null +, fdk_aac ? null , nativeHspSupport ? true , nativeHfpSupport ? true , ofonoSupport ? true , hsphfpdSupport ? true -, pulseTunnelSupport ? true, libpulseaudio ? null -, zeroconfSupport ? true, avahi ? null +, pulseTunnelSupport ? true +, libpulseaudio ? null +, zeroconfSupport ? true +, avahi ? null }: let fontsConf = makeFontsConf { - fontDirectories = []; + fontDirectories = [ ]; }; mesonEnable = b: if b then "enabled" else "disabled"; @@ -48,7 +57,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.33"; + version = "0.3.34"; outputs = [ "out" @@ -66,7 +75,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-HP2HcGjrLw0+8pO1upvJQk32v+bifYpi5Rtod0TbBis="; + sha256 = "sha256-ZFARA7YuDnpObGLWbgy1Rk+wzmAxHEMuHQkb6tWD0s0="; }; patches = [ @@ -213,4 +222,5 @@ let }; }; -in self +in +self |