From 2b71de4a3dafbac8533469d5f1a5d7fb10758614 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Wed, 13 Apr 2022 15:30:13 +0300 Subject: [PATCH 1/2] pipewire: 0.3.49 -> 0.3.50 --- .../desktops/pipewire/daemon/pipewire-pulse.conf.json | 3 +++ pkgs/development/libraries/pipewire/default.nix | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json b/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json index b19fb33ec178..114afbfb0ea4 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json @@ -61,6 +61,9 @@ { "application.process.binary": "teams" }, + { + "application.process.binary": "teams-insiders" + }, { "application.process.binary": "skypeforlinux" } diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index da594346c297..7324d02c7f21 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -68,7 +68,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.49"; + version = "0.3.50"; outputs = [ "out" @@ -86,7 +86,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-8heX/9BsPguIOzHOuqEQdt6MS3eS4HxR4A+FUZKNpdo="; + sha256 = "sha256-OMFtHduvSQNeEzQP+PlwfhWC09Jb8HN4SI42Z9KpZHE="; }; patches = [ @@ -102,11 +102,11 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch - # Fixes missing function declarations in pipewire headers + # Fixes invalid declarations in headers when compiled as ISO C90 # Should be removed after the next release (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/a2e98e28c1e6fb58b273ef582398d8bee4d2b769.patch"; - sha256 = "sha256-tqiiAW2fTEp23HT59XR2D/G08pVENJtpxUI7UVufj/A="; + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d3ea3142e1a4de206e616bc18f63a529e6b4986a.patch"; + sha256 = "sha256-2MTCOwQEA7UAm/eigHDHA+8oFs4JgQfoMHnfzNBjqvI="; }) ]; From 37c288082b2108671d551e770f79f2f505fbdb07 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Fri, 29 Apr 2022 04:26:53 +0300 Subject: [PATCH 2/2] pipewire: 0.3.50 -> 0.3.51 --- pkgs/development/libraries/pipewire/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 7324d02c7f21..96d8c9c20529 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -2,7 +2,6 @@ , lib , buildPackages , fetchFromGitLab -, fetchpatch , removeReferencesTo , python3 , meson @@ -68,7 +67,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.50"; + version = "0.3.51"; outputs = [ "out" @@ -86,7 +85,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-OMFtHduvSQNeEzQP+PlwfhWC09Jb8HN4SI42Z9KpZHE="; + sha256 = "sha256-k5OdKgkQUaelvrGS4KtO0MtSJg6cF2Nf8RrsR8Kf+C8="; }; patches = [ @@ -102,12 +101,6 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch - # Fixes invalid declarations in headers when compiled as ISO C90 - # Should be removed after the next release - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d3ea3142e1a4de206e616bc18f63a529e6b4986a.patch"; - sha256 = "sha256-2MTCOwQEA7UAm/eigHDHA+8oFs4JgQfoMHnfzNBjqvI="; - }) ]; nativeBuildInputs = [