Merge pull request #200551 from K900/pipewire-0.3.60

This commit is contained in:
Martin Weinelt 2022-11-11 03:26:40 +01:00 committed by GitHub
commit f959ccac3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -68,11 +68,10 @@
let let
mesonEnableFeature = b: if b then "enabled" else "disabled"; mesonEnableFeature = b: if b then "enabled" else "disabled";
mesonList = l: "[" + lib.concatStringsSep "," l + "]";
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "pipewire"; pname = "pipewire";
version = "0.3.59"; version = "0.3.60";
outputs = [ outputs = [
"out" "out"
@ -90,7 +89,7 @@ let
owner = "pipewire"; owner = "pipewire";
repo = "pipewire"; repo = "pipewire";
rev = version; rev = version;
sha256 = "sha256-4wDtdgkjBRlthhwbI3cSQFnbr+gxPQP5j5YnrWiQVp4="; sha256 = "sha256-HDE2QAV2jnEJCqgiGx4TVP4ceeKAqwd4P3OYw6auNAM=";
}; };
patches = [ patches = [
@ -107,10 +106,11 @@ let
# Place SPA data files in lib output to avoid dependency cycles # Place SPA data files in lib output to avoid dependency cycles
./0095-spa-data-dir.patch ./0095-spa-data-dir.patch
# remove when updating to 0.3.60 # Recommended backport patch to fix tdesktop with pw-pulse
(fetchpatch { # filter-chain: iterate the port correctly # FIXME: remove in 0.3.61
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/94a64268613adac8ef6f3e6c1f04468220540d00.patch"; (fetchpatch {
sha256 = "sha256-IDTB7NgadgR3vKv97Nvd9pBfnOnMi21YsvLdD1Ew7HE="; url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b720da771efa950cf380101bed42d5d5ee177908.diff";
hash = "sha256-p/BvatnbEJAMLQUUOECKAK7FppaNp9ei3FHjAw2spM8=";
}) })
]; ];