MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #168804 from jansol/pipewire

Browse source 
pipewire: 0.3.49 -> 0.3.51
This commit is contained in:
Sandro 2022-04-29 17:08:13 +02:00 committed by GitHub
commit fdc0d007bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json
View file

@ -61,6 +61,9 @@
{ {
"application.process.binary": "teams" "application.process.binary": "teams"
}, },
{
"application.process.binary": "teams-insiders"
},
{ {
"application.process.binary": "skypeforlinux" "application.process.binary": "skypeforlinux"
} }

11
pkgs/development/libraries/pipewire/default.nix
View file

@ -2,7 +2,6 @@
, lib , lib
, buildPackages , buildPackages
, fetchFromGitLab , fetchFromGitLab
, fetchpatch
, removeReferencesTo , removeReferencesTo
, python3 , python3
, meson , meson
@ -68,7 +67,7 @@ let
self = stdenv.mkDerivation rec { self = stdenv.mkDerivation rec {
pname = "pipewire"; pname = "pipewire";
version = "0.3.49"; version = "0.3.51";
outputs = [ outputs = [
"out" "out"
@ -86,7 +85,7 @@ let
owner = "pipewire"; owner = "pipewire";
repo = "pipewire"; repo = "pipewire";
rev = version; rev = version;
sha256 = "sha256-8heX/9BsPguIOzHOuqEQdt6MS3eS4HxR4A+FUZKNpdo="; sha256 = "sha256-k5OdKgkQUaelvrGS4KtO0MtSJg6cF2Nf8RrsR8Kf+C8=";
}; };
patches = [ patches = [
@ -102,12 +101,6 @@ let
./0090-pipewire-config-template-paths.patch ./0090-pipewire-config-template-paths.patch
# 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
# Fixes missing function declarations in pipewire headers
# Should be removed after the next release
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/a2e98e28c1e6fb58b273ef582398d8bee4d2b769.patch";
sha256 = "sha256-tqiiAW2fTEp23HT59XR2D/G08pVENJtpxUI7UVufj/A=";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [