public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #138118 from NixOS/backport-137533-to-release-21.05

Browse Source 
[Backport release-21.05] pipewire: 0.3.34 -> 0.3.35
This commit is contained in:
Kim Lindberger
2021-09-20 08:22:10 +02:00
committed by GitHub
parent 60f651c276 66528906a5
commit d15b1724c9
3 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch
View File

@@ -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 = "<session_manager_path>" args = "@session_manager_args@" }
- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
+ @sm_comment@{ path = "<session_manager_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 = "<pipewire_path>" args = "-c pipewire-pulse.conf" }
- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" }
+ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" }
]

8
pkgs/development/libraries/pipewire/default.nix
View File

@@ -7,6 +7,7 @@
, ninja
, systemd
, pkg-config
, docutils
, doxygen
, graphviz
, valgrind
@@ -57,7 +58,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.34";
version = "0.3.35";
outputs = [
"out"
@@ -66,6 +67,7 @@ let
"jack"
"dev"
"doc"
"man"
"mediaSession"
"installedTests"
];
@@ -75,7 +77,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "sha256-ZFARA7YuDnpObGLWbgy1Rk+wzmAxHEMuHQkb6tWD0s0=";
sha256 = "sha256-cGH0Hd4c4KLyynMb3LIwElwHD99apNiI40SwZC3KG/s=";
};
patches = [
@@ -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"