pipewire: fix build for FreeBSD #387712
pipewire: fix build for FreeBSD #387712
Conversation
rhelmot
force-pushed
the
freebsd-pipewire
branch
from
7bb3095 to
2471de9
Compare
This comment was marked as resolved.
This comment was marked as resolved.
|
I have great news about which branch this already targets! |
|
Oh sorry. Ignore my comment. |
|
I merged 1.4.0 to staging-next, which adds a few dependencies. Can you rebase on that? |
|
92c7569 is already in this branch and pipewire is already 1.4.0. |
- alsa-lib being present (detected during configure) results in the inclusion of sources which use linux-specific errno values - revive several isLinux configuration predicates
rhelmot
force-pushed
the
freebsd-pipewire
branch
from
2471de9 to
1dc5948
Compare
| systemd, | ||
| enableSystemd ? true, # enableSystemd=false maintained by maintainers.qyliss. | ||
| enableSystemd ? stdenv.hostPlatform.isLinux, # enableSystemd=false maintained by maintainers.qyliss. |
There was a problem hiding this comment.
Nit: should this maybe check if systemd is availableOn hostSystem?
| ffadoSupport ? | ||
| x11Support | ||
| && lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform | ||
| && stdenv.hostPlatform.isLinux, |
| @@ -65,6 +71,9 @@ let | |||
| webrtc-audio-processing_1 | |||
| webrtc-audio-processing | |||
| ]; | |||
|
|
|||
| bluezSupport = stdenv.hostPlatform.isLinux; | |||
There was a problem hiding this comment.
And maybe here? Unless those are available on BSD and you don't want them for whatever reason?
| (lib.mesonEnable "docs" true) | ||
| (lib.mesonOption "udevrulesdir" "lib/udev/rules.d") | ||
| (lib.mesonEnable "installed_tests" true) | ||
| (lib.mesonOption "installed_test_prefix" (placeholder "installedTests")) | ||
| (lib.mesonOption "libjack-path" "${placeholder "jack"}/lib") | ||
| (lib.mesonEnable "echo-cancel-webrtc" (webrtc-audio-processings != [ ])) | ||
| (lib.mesonEnable "libcamera" true) | ||
| (lib.mesonEnable "libcamera" (lib.meta.availableOn stdenv.hostPlatform libcamera)) |
|
The only one of these I'm dead set on actually being isLinux is alsa, since even though that one can compile on freebsd, it pulls in pipewire source code which uses linuxisms, and less so, bluez, since it is several dependencies and I don't want the giant && chain. The others I will attempt to switch to isAvailable. |
|
Status of this PR? |
|
I believe I satisfied the requested changes. |
|
@K900 Good for you? |
|
Sorry, lost track of this one. I'll take another look in a couple of hours. |
cc #328999
Not that I haven't booted a graphical environment with this yet - this is simply a dependency for openal-soft, which is a dependency of something else I wanted.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.