From a7f554bb71ffb23513cf16e3cd4aba1be2e17e2b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 14 Nov 2025 23:34:09 +0100 Subject: [PATCH 1/2] mt32emu-qt: Fix build with CMake 4 --- pkgs/by-name/mt/mt32emu-qt/package.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mt/mt32emu-qt/package.nix b/pkgs/by-name/mt/mt32emu-qt/package.nix index a7eb6f529ca3..ab356671d063 100644 --- a/pkgs/by-name/mt/mt32emu-qt/package.nix +++ b/pkgs/by-name/mt/mt32emu-qt/package.nix @@ -24,9 +24,21 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0="; }; - postPatch = '' - sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt - ''; + postPatch = + # Make sure system-installed libmt32emu is used + # Don't depend on in-tree mt32emu to be used + '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'add_subdirectory(mt32emu)' "" \ + --replace-fail 'add_dependencies(mt32emu-qt mt32emu)' "" + '' + # Bump CMake minimum to something our CMake supports + # Fixed treewide in https://github.com/munt/munt/commit/e6af0c7e5d63680716ab350467207c938054a0df + # Remove when version > 1.11.1 + + '' + substituteInPlace CMakeLists.txt mt32emu_qt/CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 2.8.12)' 'cmake_minimum_required(VERSION 2.8.12...3.27)' + ''; nativeBuildInputs = [ cmake From cb0e6f044aa8a109cb81598ffdcb5ae38d7f9614 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 14 Nov 2025 23:36:57 +0100 Subject: [PATCH 2/2] mt32emu-qt: Generate cmakeFlags via lib.cmakeBool --- pkgs/by-name/mt/mt32emu-qt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mt/mt32emu-qt/package.nix b/pkgs/by-name/mt/mt32emu-qt/package.nix index ab356671d063..135f8e7431b1 100644 --- a/pkgs/by-name/mt/mt32emu-qt/package.nix +++ b/pkgs/by-name/mt/mt32emu-qt/package.nix @@ -59,9 +59,9 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withJack libjack2; cmakeFlags = [ - "-Dmt32emu-qt_USE_PULSEAUDIO_DYNAMIC_LOADING=OFF" - "-Dmunt_WITH_MT32EMU_QT=ON" - "-Dmunt_WITH_MT32EMU_SMF2WAV=OFF" + (lib.cmakeBool "mt32emu-qt_USE_PULSEAUDIO_DYNAMIC_LOADING" false) + (lib.cmakeBool "munt_WITH_MT32EMU_QT" true) + (lib.cmakeBool "munt_WITH_MT32EMU_SMF2WAV" false) ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''