From ae734d01c408d3836c8d8eb3c0c6e15a8efc4f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?= Date: Tue, 4 Mar 2025 08:01:33 +0100 Subject: [PATCH] mumble: Add dependency on nix provided nlohmann_json --- pkgs/applications/networking/mumble/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index d666d85d8387..975e8ca89392 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -33,6 +33,7 @@ speechdSupport ? false, speechd-minimal, microsoft-gsl, + nlohmann_json, }: let @@ -59,6 +60,7 @@ let poco protobuf microsoft-gsl + nlohmann_json ] ++ (overrides.buildInputs or [ ]); cmakeFlags = [ @@ -66,6 +68,7 @@ let "-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17 "-D BUILD_NUMBER=${lib.versions.patch source.version}" "-D bundled-gsl=OFF" + "-D bundled-json=OFF" ] ++ (overrides.cmakeFlags or [ ]); preConfigure = '' @@ -102,7 +105,6 @@ let libvorbis qt5.qtsvg rnnoise - speex ] ++ lib.optional (!jackSupport) alsa-lib ++ lib.optional jackSupport libjack2