From 34522e9fa5b59bbc96951be8a5b3b62880cd303c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 24 Jul 2025 08:41:49 -0500 Subject: [PATCH 1/2] pianobooster: migrate to by-name --- .../default.nix => by-name/pi/pianobooster/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/pianobooster/default.nix => by-name/pi/pianobooster/package.nix} (100%) diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/by-name/pi/pianobooster/package.nix similarity index 100% rename from pkgs/applications/audio/pianobooster/default.nix rename to pkgs/by-name/pi/pianobooster/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf286aadb46b..901d2fecccab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13411,8 +13411,6 @@ with pkgs; stdenv = gccStdenv; }; - pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; - pianoteq = callPackage ../applications/audio/pianoteq { }; pidginPackages = recurseIntoAttrs ( From 2e5d7a15f9a60cd192c3db5bd2425c17320102a7 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 24 Jul 2025 08:50:05 -0500 Subject: [PATCH 2/2] pianobooster: refactor meta section and switch to finalAttrs --- pkgs/by-name/pi/pianobooster/package.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/pi/pianobooster/package.nix b/pkgs/by-name/pi/pianobooster/package.nix index 3ec19cf487dc..69336826e737 100644 --- a/pkgs/by-name/pi/pianobooster/package.nix +++ b/pkgs/by-name/pi/pianobooster/package.nix @@ -4,27 +4,25 @@ fetchFromGitHub, cmake, pkg-config, - qttools, alsa-lib, ftgl, libGLU, - qtbase, rtmidi, libjack2, fluidsynth, soundfont-fluid, unzip, - wrapQtAppsHook, + libsForQt5, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pianobooster"; version = "1.0.0"; src = fetchFromGitHub { owner = "pianobooster"; repo = "PianoBooster"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-1WOlAm/HXSL6QK0Kd1mnFEZxxpMseTG+6WzgMNWt+RA="; }; @@ -37,15 +35,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config + ] + ++ (with libsForQt5; [ qttools wrapQtAppsHook - ]; + ]); buildInputs = [ alsa-lib ftgl libGLU - qtbase + libsForQt5.qtbase rtmidi libjack2 fluidsynth @@ -62,12 +62,12 @@ stdenv.mkDerivation rec { ) ''; - meta = with lib; { + meta = { description = "MIDI file player that teaches you how to play the piano"; mainProgram = "pianobooster"; homepage = "https://github.com/pianobooster/PianoBooster"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ orivej ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ orivej ]; }; -} +})