nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 00:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

mumble: use lib helpers for cmake options where it makes them simpler

Browse Source 
These are the cases where bools have to be converted to options, so the
helpers help make the code shorter and easier to read.
This commit is contained in:
‮rekcäH nitraM‮
2025-03-05 08:35:25 +01:00
parent 3d6d1c6db8
commit 8dcb8d4a44
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/applications/networking/mumble/default.nix
View File

@@ -107,22 +107,22 @@ let
++ lib.optional pulseSupport libpulseaudio
++ lib.optional pipewireSupport pipewire;
cmakeFlags =
[
"-D server=OFF"
"-D bundled-celt=ON"
"-D bundled-opus=OFF"
"-D bundled-speex=OFF"
"-D bundle-qt-translations=OFF"
"-D update=OFF"
"-D overlay-xcompile=OFF"
"-D oss=OFF"
"-D warnings-as-errors=OFF" # conversion error workaround
]
++ lib.optional (!speechdSupport) "-D speechd=OFF"
++ lib.optional (!pulseSupport) "-D pulseaudio=OFF"
++ lib.optional (!pipewireSupport) "-D pipewire=OFF"
++ lib.optional jackSupport "-D alsa=OFF -D jackaudio=ON";
cmakeFlags = [
"-D server=OFF"
"-D bundled-celt=ON"
"-D bundled-opus=OFF"
"-D bundled-speex=OFF"
"-D bundle-qt-translations=OFF"
"-D update=OFF"
"-D overlay-xcompile=OFF"
"-D oss=OFF"
"-D warnings-as-errors=OFF" # conversion error workaround
(lib.cmakeBool "speechd" speechdSupport)
(lib.cmakeBool "pulseaudio" pulseSupport)
(lib.cmakeBool "pipewire" pipewireSupport)
(lib.cmakeBool "jackaudio" jackSupport)
(lib.cmakeBool "alsa" (!jackSupport))
];
env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd-minimal}/include/speech-dispatcher";
@@ -144,8 +144,8 @@ let
cmakeFlags =
[
"-D client=OFF"
(lib.cmakeBool "ice" iceSupport)
]
++ lib.optional (!iceSupport) "-D ice=OFF"
++ lib.optionals iceSupport [
"-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"
"-D CMAKE_PREFIX_PATH=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}"