From c949c1cacdafa109ba98a034883d79950d0baf26 Mon Sep 17 00:00:00 2001
From: Lord-Valen <lord_valen@protonmail.com>
Date: Fri, 29 Mar 2024 17:58:25 -0400
Subject: [PATCH 1/4] guitarix: use `finalAttrs`

---
 pkgs/applications/audio/guitarix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 2134370eac9f..5b3ef56dc18a 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -42,12 +42,12 @@ let
   inherit (lib) optional;
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "guitarix";
   version = "0.44.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
+    url = "mirror://sourceforge/guitarix/guitarix2-${finalAttrs.version}.tar.xz";
     sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg=";
   };
 
@@ -145,4 +145,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ astsmtl goibhniu ];
     platforms = platforms.linux;
   };
-}
+})

From af7b0f1bd82f3cd31b0f01013d6f9c40482812df Mon Sep 17 00:00:00 2001
From: Lord-Valen <lord_valen@protonmail.com>
Date: Fri, 29 Mar 2024 18:25:51 -0400
Subject: [PATCH 2/4] guitarix: 0.44.1 -> 0.46.0

---
 pkgs/applications/audio/guitarix/default.nix | 24 ++++----------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 5b3ef56dc18a..f6396dcd2700 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch
 , avahi
 , bluez
 , boost
@@ -44,28 +43,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "guitarix";
-  version = "0.44.1";
+  version = "0.46.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/guitarix/guitarix2-${finalAttrs.version}.tar.xz";
-    sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg=";
+    url = "https://github.com/brummer10/guitarix/releases/download/V${finalAttrs.version}/guitarix2-${finalAttrs.version}.tar.xz";
+    sha256 = "sha256-xmC+s/Fs3EVdmebwdM1uorHxDB38SA6EIQRhY33JjEQ=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "gcc13-fixes.patch";
-      url = "https://github.com/brummer10/guitarix/commit/b52736180b6966f24398f8a5ad179a58173473ec.patch";
-      hash = "sha256-+jilgLujy/B6ijUb8NHzt3+4IKCt17X8LmuMLdmsvGw=";
-      relative = "trunk";
-    })
-  ];
-
-  # doesnt apply cleanly, so doing with substituteInPlace
-  # https://github.com/brummer10/guitarix/commit/39d7c21c4173eb0f121b1bbff439d9cf43331a00.patch
-  postPatch = ''
-    substituteInPlace wscript --replace "open(src_fname, 'rU')" "open(src_fname, 'r')"
-  '';
-
   nativeBuildInputs = [
     gettext
     hicolor-icon-theme
@@ -140,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
       clean-sounds, nice overdrive, fat distortion and a diversity of
       crazy sounds never heard before.
     '';
-    homepage = "http://guitarix.sourceforge.net/";
+    homepage = "https://github.com/brummer10/guitarix";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ astsmtl goibhniu ];
     platforms = platforms.linux;

From 3f3b3e4705095dce941faba20506c1fc3aff0098 Mon Sep 17 00:00:00 2001
From: Lord-Valen <lord_valen@protonmail.com>
Date: Fri, 5 Apr 2024 15:17:59 -0400
Subject: [PATCH 3/4] guitarix: use fetchFromGitHub

---
 pkgs/applications/audio/guitarix/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index f6396dcd2700..5ab2889a52c2 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, fetchurl
+, fetchFromGitHub
 , avahi
 , bluez
 , boost
@@ -45,11 +45,16 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "guitarix";
   version = "0.46.0";
 
-  src = fetchurl {
-    url = "https://github.com/brummer10/guitarix/releases/download/V${finalAttrs.version}/guitarix2-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-xmC+s/Fs3EVdmebwdM1uorHxDB38SA6EIQRhY33JjEQ=";
+  src = fetchFromGitHub {
+    owner = "brummer10";
+    repo = "guitarix";
+    rev = "V${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-AftC6fQEDzG/3C/83YbK/++bRgP7vPD0E2X6KEWpowc=";
   };
 
+  sourceRoot = "${finalAttrs.src.name}/trunk";
+
   nativeBuildInputs = [
     gettext
     hicolor-icon-theme

From f0fde0f8ce015063ace056ca0a35e322693e281e Mon Sep 17 00:00:00 2001
From: Lord-Valen <lord_valen@protonmail.com>
Date: Fri, 5 Apr 2024 15:18:49 -0400
Subject: [PATCH 4/4] guitarix: add lord-valen as maintainer

---
 pkgs/applications/audio/guitarix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 5ab2889a52c2..c1d1cf5571c5 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/brummer10/guitarix";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ astsmtl goibhniu ];
+    maintainers = with maintainers; [ astsmtl goibhniu lord-valen ];
     platforms = platforms.linux;
   };
 })