nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 19:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

pipewire: 0.3.69 -> 0.3.70

Browse Source 
https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.70
This commit is contained in:
K900 2023-04-20 15:47:20 +03:00
parent f0a025d9d2
commit c65c7ae5f0
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in
index 6464839a0..05546201f 100644
index 9c885a38f..c474eb45d 100644
--- a/src/daemon/minimal.conf.in
+++ b/src/daemon/minimal.conf.in
@@ -110,7 +110,7 @@ context.modules = [
@@ -111,7 +111,7 @@ context.modules = [
# access.allowed to list an array of paths of allowed
# apps.
#access.allowed = [
@ -11,7 +11,7 @@ index 6464839a0..05546201f 100644
#]
# An array of rejected paths.
@@ -298,5 +298,5 @@ context.exec = [
@@ -359,5 +359,5 @@ context.exec = [
# It can be interesting to start another daemon here that listens
# on another address with the -a option (eg. -a tcp:4713).
#
@ -19,10 +19,10 @@ index 6464839a0..05546201f 100644
+ #@pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" }
]
diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
index a948a1b9b..4ece43c6f 100644
index 697bf094d..3a7b54ddd 100644
--- a/src/daemon/pipewire.conf.in
+++ b/src/daemon/pipewire.conf.in
@@ -132,7 +132,7 @@ context.modules = [
@@ -142,7 +142,7 @@ context.modules = [
# access.allowed to list an array of paths of allowed
# apps.
#access.allowed = [
@ -31,18 +31,20 @@ index a948a1b9b..4ece43c6f 100644
#]
# An array of rejected paths.
@@ -246,12 +246,12 @@ context.exec = [
@@ -294,7 +294,7 @@ context.exec = [
# but it is better to start it as a systemd service.
# Run the session manager with -h for options.
#
- @sm_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@"
+ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@"
@sm_comment@ condition = [ { exec.session-manager = null } { exec.session-manager = true } ] }
#
# You can optionally start the pulseaudio-server here as well
# but it is better to start it as a systemd service.
@@ -302,6 +302,6 @@ context.exec = [
# It can be interesting to start another daemon here that listens
# on another address with the -a option (eg. -a tcp:4713).
#
- @pulse_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"
+ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf"
@pulse_comment@ condition = [ { exec.pipewire-pulse = null } { exec.pipewire-pulse = true } ] }
]

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

@ -73,7 +73,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.69";
version = "0.3.70";
outputs = [
"out"
@ -91,7 +91,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "sha256-1eUyRkXfcvV0scWYPnDSpqJBWJNOYEZX0aVQSQeMwyE=";
sha256 = "sha256-xhJzE6JcfNcLMm+TqTIPaBEnEthEqUZiTqhWz1fO5Ng=";
};
patches = [
@ -107,11 +107,6 @@ let
./0090-pipewire-config-template-paths.patch
# Place SPA data files in lib output to avoid dependency cycles
./0095-spa-data-dir.patch
(fetchpatch {
url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/a275e825c75c93775baaeb17479e38d035d9b79a.patch";
hash = "sha256-y1kDtMy5MgDPv/TgV8xZ8rmzQ12ZsZafKMqJ3+QIu8E=";
})
];
strictDeps = true;