Skip to content

[staging-next] Pipewire 0.3.71 #232405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
K900 merged 2 commits into from
May 17, 2023
Merged

[staging-next] Pipewire 0.3.71 #232405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45a5571
libcamera: 0.0.3 -> 0.0.5
K900 May 17, 2023
8c4008d
pipewire: 0.3.70 -> 0.3.71
K900 May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libcamera/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@

stdenv.mkDerivation rec {
pname = "libcamera";
version = "0.0.3";
version = "0.0.5";

src = fetchgit {
url = "https://git.libcamera.org/libcamera/libcamera.git";
rev = "v${version}";
hash = "sha256-0/wvH07bJRKFwYnOARRJNzH8enIX3TNnWQnJdfpfvgE=";
hash = "sha256-rd1YIEosg4+H/FJBYCoxdQlV9F0evU5fckHJrSdVPOE=";
};

outputs = [ "out" "dev" "doc" ];
Expand Down
26 changes: 26 additions & 0 deletions pkgs/development/libraries/pipewire/0060-libjack-path.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 5d2dc9984..35f5773aa 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -169,6 +169,7 @@ if build_module_jack_tunnel
install_dir : modules_install_dir,
install_rpath: modules_install_dir,
dependencies : [mathlib, dl_lib, pipewire_dep],
+ c_args: '-DNIXPKGS_LIBJACK_PATH="@0@"'.format(jack_dep.get_variable('libdir'))
)
build_module_jackdbus_detect = dbus_dep.found()
if build_module_jackdbus_detect
diff --git a/src/modules/module-jack-tunnel/weakjack.h b/src/modules/module-jack-tunnel/weakjack.h
index 42580f798..e7aadd3cc 100644
--- a/src/modules/module-jack-tunnel/weakjack.h
+++ b/src/modules/module-jack-tunnel/weakjack.h
@@ -164,8 +164,7 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib)

search_dirs = getenv("LIBJACK_PATH");
if (!search_dirs)
- search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:"
- "/usr/lib64/:/usr/lib/:" LIBDIR;
+ search_dirs = NIXPKGS_LIBJACK_PATH;

while ((p = pw_split_walk(search_dirs, ":", &len, &state))) {
int pathlen;
6 changes: 4 additions & 2 deletions pkgs/development/libraries/pipewire/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ let

self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.70";
version = "0.3.71";

outputs = [
"out"
Expand All @@ -91,14 +91,16 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "sha256-xhJzE6JcfNcLMm+TqTIPaBEnEthEqUZiTqhWz1fO5Ng=";
sha256 = "sha256-NPYWl+WeI/z70gNHX1BAKslGFX634D7XrV04vuJgGOo=";
};

patches = [
# Break up a dependency cycle between outputs.
./0040-alsa-profiles-use-libdir.patch
# Change the path of the pipewire-pulse binary in the service definition.
./0050-pipewire-pulse-path.patch
# Load libjack from a known location
./0060-libjack-path.patch
# Move installed tests into their own output.
./0070-installed-tests-path.patch
# Add option for changing the config install directory
Expand Down