From 6a8e9b408904ed60525ead42c0cd4c58c04af9e6 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 13 May 2025 12:22:55 -0400 Subject: [PATCH] gotraceui: fix build Upstream switched to a to a fork of `Gio` cause it fails to build with Go 1.24 in https://github.com/dominikh/gotraceui/commit/00289f5f4c1da3e13babd2389e533b069cd18e3c --- pkgs/by-name/go/gotraceui/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gotraceui/package.nix b/pkgs/by-name/go/gotraceui/package.nix index 9730a2e6df91..fad24526af25 100644 --- a/pkgs/by-name/go/gotraceui/package.nix +++ b/pkgs/by-name/go/gotraceui/package.nix @@ -10,6 +10,7 @@ libxkbcommon, vulkan-headers, wayland, + fetchpatch, }: buildGoModule rec { @@ -19,11 +20,19 @@ buildGoModule rec { src = fetchFromGitHub { owner = "dominikh"; repo = "gotraceui"; - rev = "v${version}"; + tag = "v${version}"; sha256 = "sha256-Rforuh9YlTv/mTpQm0+BaY+Ssc4DAiDCzVkIerP5Uz0="; }; - vendorHash = "sha256-dNV5u6BG+2Nzci6dX/4/4WAeM/zXE5+Ix0HqIsNnm0E="; + patches = [ + (fetchpatch { + name = "switch-to-gio-fork.patch"; + url = "https://github.com/dominikh/gotraceui/commit/00289f5f4c1da3e13babd2389e533b069cd18e3c.diff"; + hash = "sha256-dxsVMjyKkRG4Q6mONlJAohWJ8YTu8KN7ynPVycJhcs8="; + }) + ]; + + vendorHash = "sha256-9rzcSxlOuQC5bt1kZuRX7CTQaDHKrtGRpMNLrOHTjJk="; subPackages = [ "cmd/gotraceui" ]; nativeBuildInputs = [ pkg-config ];