From 184f1ffea00ad5c1bc75dc7841759eac70cd8640 Mon Sep 17 00:00:00 2001
From: OPNA2608 <christoph.neidahl@gmail.com>
Date: Sun, 1 Aug 2021 20:35:05 +0200
Subject: bambootracker: 0.4.6 -> 0.5.0

---
 pkgs/applications/audio/bambootracker/default.nix | 34 +++++++++--------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix
index 09be8faa8a0..591c14c1adf 100644
--- a/pkgs/applications/audio/bambootracker/default.nix
+++ b/pkgs/applications/audio/bambootracker/default.nix
@@ -2,7 +2,6 @@
 , stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , qmake
 , pkg-config
 , qttools
@@ -13,25 +12,16 @@
 
 mkDerivation rec {
   pname = "bambootracker";
-  version = "0.4.6";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
-    owner = "rerrahkr";
+    owner = "BambooTracker";
     repo = "BambooTracker";
     rev = "v${version}";
-    sha256 = "0iddqfw951dw9xpl4w7310sl4z544507ppb12i8g4fzvlxfw2ifc";
+    fetchSubmodules = true;
+    sha256 = "1mpbvhsmrn0wdmxfp3n5dwv4474qlhy47r3vwc2jwdslq6vgl1fa";
   };
 
-  # TODO Remove when updating past 0.4.6
-  # Fixes build failure on darwin
-  patches = [
-    (fetchpatch {
-      name = "bambootracker-Add_braces_in_initialization_of_std-array.patch";
-      url = "https://github.com/rerrahkr/BambooTracker/commit/0fc96c60c7ae6c2504ee696bb7dec979ac19717d.patch";
-      sha256 = "1z28af46mqrgnyrr4i8883gp3wablkk8rijnj0jvpq01s4m2sfjn";
-    })
-  ];
-
   nativeBuildInputs = [ qmake qttools pkg-config ];
 
   buildInputs = [ qtbase rtaudio rtmidi ];
@@ -40,18 +30,20 @@ mkDerivation rec {
 
   postConfigure = "make qmake_all";
 
-  # installs app bundle on darwin, re-extract the binary
-  # wrapQtAppsHook fails to wrap mach-o binaries, manually call wrapper (https://github.com/NixOS/nixpkgs/issues/102044)
+  # 1. installs app bundle on darwin, move to app bundle dir & link binary to bin
+  # 2. wrapQtAppsHook fails to wrap mach-o binaries automatically, manually call wrapper
+  #    (see https://github.com/NixOS/nixpkgs/issues/102044)
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mv $out/bin/BambooTracker{.app/Contents/MacOS/BambooTracker,}
-    rm -r $out/bin/BambooTracker.app
-    wrapQtApp $out/bin/BambooTracker
+    mkdir -p $out/Applications
+    mv $out/{bin,Applications}/BambooTracker.app
+    wrapQtApp $out/Applications/BambooTracker.app/Contents/MacOS/BambooTracker
+    ln -s $out/{Applications/BambooTracker.app/Contents/MacOS,bin}/BambooTracker
   '';
 
   meta = with lib; {
     description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers";
-    homepage = "https://rerrahkr.github.io/BambooTracker";
-    license = licenses.gpl2Only;
+    homepage = "https://bambootracker.github.io/BambooTracker/";
+    license = licenses.gpl2Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ OPNA2608 ];
   };
-- 
cgit 1.4.1