diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 2134370eac9f..c1d1cf5571c5 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchurl -, fetchpatch +, fetchFromGitHub , avahi , bluez , boost @@ -42,29 +41,19 @@ let inherit (lib) optional; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "guitarix"; - version = "0.44.1"; + version = "0.46.0"; - src = fetchurl { - url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "d+g9dU9RrDjFQj847rVd5bPiYSjmC1EbAtLe/PNubBg="; + src = fetchFromGitHub { + owner = "brummer10"; + repo = "guitarix"; + rev = "V${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-AftC6fQEDzG/3C/83YbK/++bRgP7vPD0E2X6KEWpowc="; }; - 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')" - ''; + sourceRoot = "${finalAttrs.src.name}/trunk"; nativeBuildInputs = [ gettext @@ -140,9 +129,9 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = with maintainers; [ astsmtl goibhniu lord-valen ]; platforms = platforms.linux; }; -} +})