From ddcd07f4a8ab984fe44016facb4b634c7cb3ba4b Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Tue, 1 Nov 2022 10:40:25 +0000 Subject: [PATCH] pianobooster: 0.7.2b -> 1.0.0 (#197900) Co-authored-by: Sandro Co-authored-by: linsui --- .../audio/pianobooster/default.nix | 56 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index 2c58ecc5dcbb..7d62aa61d6b0 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,29 +1,69 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools -, alsa-lib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, qttools +, alsa-lib +, ftgl +, libGLU +, qtbase +, rtmidi +, libjack2 +, fluidsynth +, soundfont-fluid +, unzip +, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "pianobooster"; - version = "0.7.2b"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "captnfab"; + owner = "pianobooster"; repo = "PianoBooster"; rev = "v${version}"; - sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj"; + hash = "sha256-1WOlAm/HXSL6QK0Kd1mnFEZxxpMseTG+6WzgMNWt+RA="; }; - nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; + postPatch = '' + substituteInPlace src/Settings.cpp src/GuiMidiSetupDialog.cpp \ + --replace "/usr/share/soundfonts" "${soundfont-fluid}/share/soundfonts" \ + --replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2" + ''; - buildInputs = [ alsa-lib ftgl libGLU libjack2 qtbase rtmidi ]; + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + alsa-lib + ftgl + libGLU + qtbase + rtmidi + libjack2 + fluidsynth + ]; cmakeFlags = [ "-DOpenGL_GL_PREFERENCE=GLVND" + "-DUSE_JACK=ON" ]; + postInstall = '' + qtWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ unzip ]}" + ) + ''; + meta = with lib; { description = "A MIDI file player that teaches you how to play the piano"; - homepage = "https://github.com/captnfab/PianoBooster"; + homepage = "https://github.com/pianobooster/PianoBooster"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu orivej ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2d16233d804..762fb599df35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31076,7 +31076,7 @@ with pkgs; pianobar = callPackage ../applications/audio/pianobar { }; - pianobooster = qt5.callPackage ../applications/audio/pianobooster { stdenv = gcc10StdenvCompat; }; + pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; pianoteq = callPackage ../applications/audio/pianoteq { };