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

pipewire: 0.3.36 -> 0.3.37

Browse Source
This commit is contained in:
Jan Solanti
2021-09-25 17:49:23 +03:00
parent 7bb26f4abc
commit beb1373e15
5 changed files with 19 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in
index 95632c250..a88aac6e2 100644
index 648e13069..50f767f0c 100644
--- a/src/daemon/pipewire.conf.in
+++ b/src/daemon/pipewire.conf.in
@@ -131,7 +131,7 @@ context.modules = [
@@ -15,8 +15,8 @@ index 95632c250..a88aac6e2 100644
# 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@" }
#
# You can optionally start the pulseaudio-server here as well
# but it is better to start it as a systemd service.

12
pkgs/development/libraries/pipewire/0095-spa-data-dir.patch Normal file
View File

@@ -0,0 +1,12 @@
diff --git a/meson.build b/meson.build
index 56599ebd1..3bed2d3e3 100644
--- a/meson.build
+++ b/meson.build
@@ -54,7 +54,7 @@ else
endif
spa_plugindir = pipewire_libdir / spa_name
-spa_datadir = pipewire_datadir / spa_name
+spa_datadir = pipewire_libdir / spa_name
alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer'

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

@@ -58,7 +58,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.36";
version = "0.3.37";
outputs = [
"out"
@@ -77,7 +77,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "sha256-kwoffB0Hi84T4Q0NaxLxsCyPV4R0LayX9kHmXU/vRPA=";
sha256 = "sha256-bN73G2XYEWJF60D55WCpsbMW54wce7rCgEUo/DUmm20=";
};
patches = [
@@ -93,6 +93,8 @@ let
./0080-pipewire-config-dir.patch
# Remove output paths from the comments in the config templates to break dependency cycles
./0090-pipewire-config-template-paths.patch
# Place SPA data files in lib output to avoid dependency cycles
./0095-spa-data-dir.patch
];
nativeBuildInputs = [