git.iko.soy/typeable/nixpkgs
on master help sign in
pipewire: 0.3.30 -> 0.3.31
commiteb7e40f9c9bbf0d9f54d0a65722480abcd28c9d0 authorarcnmx <arcnmx@users.noreply.github.com> dateMon 28 Jun 2021, 11:06 (5 years ago) parent4f3bc6a
4 files changed+14−12
compare with master
unifiedsplit
nixos/modules/services/desktops/pipewire/jack.conf.json+1−1 pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch+2−5 pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch+4−4 pkgs/development/libraries/pipewire/default.nix+7−2
nixos/modules/services/desktops/pipewire/jack.conf.json+1−1
@@ -7,7 +7,7 @@
77 },
88 "context.modules": [
99 {
10− "name": "libpipewire-module-rtkit",
10+ "name": "libpipewire-module-rt",
1111 "args": {},
1212 "flags": [
1313 "ifexists",
pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch+2−5
@@ -2,16 +2,13 @@ diff --git a/meson_options.txt b/meson_options.txt
22index 93b5e2a9..1b915ac3 100644
33--- a/meson_options.txt
44+++ b/meson_options.txt
5−@@ -13,6 +13,9 @@ option('media-session',
6− description: 'Build and install pipewire-media-session',
5+@@ -200,3 +200,6 @@ option('media-session',
76 type: 'feature',
87 value: 'auto')
98+option('media-session-prefix',
109+ description: 'Install directory for pipewire-media-session and its support files',
1110+ type: 'string')
12− option('man',
13− description: 'Build manpages',
14− type: 'feature',
11+ option('session-managers',
1512diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build
1613index 1edebb2d..251270eb 100644
1714--- a/src/daemon/systemd/user/meson.build
pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch+4−4
@@ -6,8 +6,8 @@ index bbafa134..227d3e06 100644
66 # access.allowed to list an array of paths of allowed
77 # apps.
88 #access.allowed = [
9−- # @media_session_path@
10−+ # <media_session_path>
9+- # @session_manager_path@
10++ # <session_manager_path>
1111 #]
1212
1313 # An array of rejected paths.
@@ -15,8 +15,8 @@ index bbafa134..227d3e06 100644
1515 # but it is better to start it as a systemd service.
1616 # Run the session manager with -h for options.
1717 #
18−- @comment@{ path = "@media_session_path@" args = "" }
19−+ @comment@{ path = "<media_session_path>" args = "" }
18+- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
19++ @comment@{ path = "<session_manager_path>" args = "@session_manager_args@" }
2020 #
2121 # You can optionally start the pulseaudio-server here as well
2222 # but it is better to start it as a systemd service.
pkgs/development/libraries/pipewire/default.nix+7−2
@@ -14,6 +14,7 @@
1414, dbus
1515, alsa-lib
1616, libjack2
17+, libusb1
1718, udev
1819, libva
1920, libsndfile
@@ -43,10 +44,11 @@ let
4344 };
4445
4546 mesonEnable = b: if b then "enabled" else "disabled";
47+ mesonList = l: "[" + lib.concatStringsSep "," l + "]";
4648
4749 self = stdenv.mkDerivation rec {
4850 pname = "pipewire";
49− version = "0.3.30";
51+ version = "0.3.31";
5052
5153 outputs = [
5254 "out"
@@ -64,7 +66,7 @@ let
6466 owner = "pipewire";
6567 repo = "pipewire";
6668 rev = version;
67− sha256 = "sha256-DnaPvZoDaegjtJNKBmCJEAZe5FQBnSER79FPnxiWQUE=";
69+ sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79";
6870 };
6971
7072 patches = [
@@ -96,6 +98,7 @@ let
9698 dbus
9799 glib
98100 libjack2
101+ libusb1
99102 libsndfile
100103 ncurses
101104 udev
@@ -122,6 +125,7 @@ let
122125 "-Dmedia-session-prefix=${placeholder "mediaSession"}"
123126 "-Dlibjack-path=${placeholder "jack"}/lib"
124127 "-Dlibcamera=disabled"
128+ "-Droc=disabled"
125129 "-Dlibpulse=${mesonEnable pulseTunnelSupport}"
126130 "-Davahi=${mesonEnable zeroconfSupport}"
127131 "-Dgstreamer=${mesonEnable gstreamerSupport}"
@@ -133,6 +137,7 @@ let
133137 "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}"
134138 "-Dsysconfdir=/etc"
135139 "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire"
140+ "-Dsession-managers=${mesonList (lib.optional withMediaSession "media-session")}"
136141 ];
137142
138143 FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file