diff options
Diffstat (limited to 'pkgs')
3 files changed, 19 insertions, 5 deletions
diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch index d3851604a13..ea968e28ea8 100644 --- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -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. diff --git a/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch b/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch new file mode 100644 index 00000000000..d8241a809f6 --- /dev/null +++ b/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch @@ -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' diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 0ada1853998..2f17aa002d8 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -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 = [ |