diff --git a/pkgs/by-name/op/opn2bankeditor/package.nix b/pkgs/by-name/op/opn2bankeditor/package.nix index 74e6a0e6df99..cb3872eb9850 100644 --- a/pkgs/by-name/op/opn2bankeditor/package.nix +++ b/pkgs/by-name/op/opn2bankeditor/package.nix @@ -5,45 +5,39 @@ unstableGitUpdater, cmake, pkg-config, - # No Qt6 yet: https://github.com/Wohlstand/OPN2BankEditor/issues/126 - libsForQt5, + qt6Packages, rtaudio, rtmidi, }: stdenv.mkDerivation (finalAttrs: { pname = "opn2bankeditor"; - version = "1.3-unstable-2026-01-01"; + version = "1.3-unstable-2026-05-05"; src = fetchFromGitHub { owner = "Wohlstand"; repo = "opn2bankeditor"; - rev = "0371db0867ac23f49e8d160f9fd3163cf1fe41a2"; + rev = "c3e12e6b1fc1a6a295fe66c64eceeba5e52832f2"; fetchSubmodules = true; - hash = "sha256-+BgvzZoGAh9KlKjAyn7BsWnfGDB5njW8tJoFwtY0fCo="; + hash = "sha256-NosvIFVqu2b0p6QAzd+r5+TcxTNB66PZS358pWB8xpk="; }; - # https://github.com/Wohlstand/OPN2BankEditor/issues/125 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'cmake_minimum_required(VERSION 3.2)' 'cmake_minimum_required(VERSION 3.2...3.10)' - ''; - nativeBuildInputs = [ cmake pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook + qt6Packages.qttools + qt6Packages.wrapQtAppsHook ]; buildInputs = [ - libsForQt5.qtbase - libsForQt5.qwt + qt6Packages.qtbase + qt6Packages.qwt rtaudio rtmidi ]; cmakeFlags = [ + (lib.strings.cmakeFeature "BUILD_MAJOR_QT" "6") (lib.strings.cmakeBool "USE_RTAUDIO" true) (lib.strings.cmakeBool "USE_RTMIDI" true) (lib.strings.cmakeBool "USE_VENDORED_RTAUDIO" false) @@ -54,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir $out/{bin,Applications} mv "OPN2 Bank Editor.app" $out/Applications/ - install_name_tool -change {,${libsForQt5.qwt}/lib/}libqwt.6.dylib "$out/Applications/OPN2 Bank Editor.app/Contents/MacOS/OPN2 Bank Editor" + install_name_tool -change {,${qt6Packages.qwt}/lib/}libqwt.6.dylib "$out/Applications/OPN2 Bank Editor.app/Contents/MacOS/OPN2 Bank Editor" ln -s "$out/Applications/OPN2 Bank Editor.app/Contents/MacOS/OPN2 Bank Editor" $out/bin/opn2_bank_editor '';