From c5d52173c2e46487f23fc695883f2f812a08c5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 22 Jan 2022 19:24:21 +0100 Subject: [PATCH] yabridge: fix meson options Fixes the build with meson 0.60. Options were renamed to lower case in https://github.com/marzer/tomlplusplus/commit/1381240e10bca82064f80cb9f8cd3a4a70671565 and build_tests and build_examples are now disabled when tomlplusplus is used as a subproject. --- pkgs/tools/audio/yabridge/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index c468a845a1a6..688906e684d9 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -105,11 +105,7 @@ in multiStdenv.mkDerivation rec { "-Dwith-bitbridge=true" # Requires CMake and is unnecessary - "-Dtomlplusplus:GENERATE_CMAKE_CONFIG=disabled" - - # tomlplusplus examples and tests don't build with winegcc - "-Dtomlplusplus:BUILD_EXAMPLES=disabled" - "-Dtomlplusplus:BUILD_TESTS=disabled" + "-Dtomlplusplus:generate_cmake_config=false" ]; installPhase = ''