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

pipewire: 0.3.30 -> 0.3.31 

(cherry picked from commit eb7e40f9c9bbf0d9f54d0a65722480abcd28c9d0)
Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
arcnmx 2021-06-28 11:06:44 -07:00 committed by Domen Kožar
parent 7174a61367
commit 4ef889251c
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/desktops/pipewire/jack.conf.json
View File

@ -7,7 +7,7 @@
}, },
"context.modules": [ "context.modules": [
{ {
"name": "libpipewire-module-rtkit", "name": "libpipewire-module-rt",
"args": {}, "args": {},
"flags": [ "flags": [
"ifexists", "ifexists",

7
pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch
View File

@ -2,16 +2,13 @@ diff --git a/meson_options.txt b/meson_options.txt
index 93b5e2a9..1b915ac3 100644 index 93b5e2a9..1b915ac3 100644
--- a/meson_options.txt --- a/meson_options.txt
+++ b/meson_options.txt +++ b/meson_options.txt
@@ -13,6 +13,9 @@ option('media-session', @@ -200,3 +200,6 @@ option('media-session',
description: 'Build and install pipewire-media-session',
type: 'feature', type: 'feature',
value: 'auto') value: 'auto')
+option('media-session-prefix', +option('media-session-prefix',
+ description: 'Install directory for pipewire-media-session and its support files', + description: 'Install directory for pipewire-media-session and its support files',
+ type: 'string') + type: 'string')
option('man', option('session-managers',
description: 'Build manpages',
type: 'feature',
diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
index 1edebb2d..251270eb 100644 index 1edebb2d..251270eb 100644
--- a/src/daemon/systemd/user/meson.build --- a/src/daemon/systemd/user/meson.build

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

@ -6,8 +6,8 @@ index bbafa134..227d3e06 100644
# access.allowed to list an array of paths of allowed # access.allowed to list an array of paths of allowed
# apps. # apps.
#access.allowed = [ #access.allowed = [
- # @media_session_path@ - # @session_manager_path@
+ # <media_session_path> + # <session_manager_path>
#] #]
# An array of rejected paths. # An array of rejected paths.
@ -15,8 +15,8 @@ index bbafa134..227d3e06 100644
# but it is better to start it as a systemd service. # but it is better to start it as a systemd service.
# Run the session manager with -h for options. # Run the session manager with -h for options.
# #
- @comment@{ path = "@media_session_path@" args = "" } - @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
+ @comment@{ path = "<media_session_path>" args = "" } + @comment@{ path = "<session_manager_path>" args = "@session_manager_args@" }
# #
# You can optionally start the pulseaudio-server here as well # You can optionally start the pulseaudio-server here as well
# but it is better to start it as a systemd service. # but it is better to start it as a systemd service.

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

@ -14,6 +14,7 @@
, dbus , dbus
, alsaLib , alsaLib
, libjack2 , libjack2
, libusb1
, udev , udev
, libva , libva
, libsndfile , libsndfile
@ -43,10 +44,11 @@ let
}; };
mesonEnable = b: if b then "enabled" else "disabled"; mesonEnable = 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.30"; version = "0.3.31";
outputs = [ outputs = [
"out" "out"
@ -64,7 +66,7 @@ let
owner = "pipewire"; owner = "pipewire";
repo = "pipewire"; repo = "pipewire";
rev = version; rev = version;
sha256 = "sha256-DnaPvZoDaegjtJNKBmCJEAZe5FQBnSER79FPnxiWQUE="; sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79";
}; };
patches = [ patches = [
@ -96,6 +98,7 @@ let
dbus dbus
glib glib
libjack2 libjack2
libusb1
libsndfile libsndfile
ncurses ncurses
udev udev
@ -122,6 +125,7 @@ let
"-Dmedia-session-prefix=${placeholder "mediaSession"}" "-Dmedia-session-prefix=${placeholder "mediaSession"}"
"-Dlibjack-path=${placeholder "jack"}/lib" "-Dlibjack-path=${placeholder "jack"}/lib"
"-Dlibcamera=disabled" "-Dlibcamera=disabled"
"-Droc=disabled"
"-Dlibpulse=${mesonEnable pulseTunnelSupport}" "-Dlibpulse=${mesonEnable pulseTunnelSupport}"
"-Davahi=${mesonEnable zeroconfSupport}" "-Davahi=${mesonEnable zeroconfSupport}"
"-Dgstreamer=${mesonEnable gstreamerSupport}" "-Dgstreamer=${mesonEnable gstreamerSupport}"
@ -133,6 +137,7 @@ let
"-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}" "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}"
"-Dsysconfdir=/etc" "-Dsysconfdir=/etc"
"-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire"
"-Dsession-managers=${mesonList (lib.optional withMediaSession "media-session")}"
]; ];
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file