From bb616687159479ddaae952f80a5364ae720a7f4d Mon Sep 17 00:00:00 2001
From: David Birks <david@birks.dev>
Date: Fri, 25 Apr 2025 21:26:22 -0400
Subject: [PATCH] Fix the issue where Goose extensions wouldn't run

There was an error from hermit behind the scenes. Ended up just pulling in uvx and npx as dependencies, and replacing the shell script that called hermit, with symlinks to the binaries instead.
---
 .SRCINFO |  4 +++-
 PKGBUILD | 13 +++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 16c578c3409a..cc876112cbe7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = goose-desktop
 	pkgdesc = An open-source, extensible AI agent that goes beyond code suggestions (with UI)
 	pkgver = 1.0.20
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/block/goose
 	arch = x86_64
 	license = Apache-2.0
 	makedepends = cargo
 	makedepends = nodejs
 	makedepends = just
+	depends = uv
+	depends = npm
 	conflicts = codename-goose
 	conflicts = codename-goose-bin
 	options = !lto
diff --git a/PKGBUILD b/PKGBUILD
index d5cf606676c6..d084d72eedb5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,15 @@
 
 pkgname=goose-desktop
 pkgver=1.0.20
-pkgrel=1
+pkgrel=2
 pkgdesc="An open-source, extensible AI agent that goes beyond code suggestions (with UI)"
 arch=("x86_64")
 url="https://github.com/block/goose"
 license=("Apache-2.0")
-depends=()
+depends=(
+  "uv"
+  "npm"
+)
 optdepends=()
 makedepends=(
   "cargo"
@@ -47,6 +50,12 @@ package() {
   mkdir -p "$pkgdir/usr/lib/$pkgname"
   cp -r "ui/desktop/out/Goose-linux-x64/"* "$pkgdir/usr/lib/$pkgname/"
   
+  # Link to local uvx and npx, instead of running the script that installs them with hermit
+  rm "$pkgdir/usr/lib/$pkgname/resources/bin/uvx"
+  rm "$pkgdir/usr/lib/$pkgname/resources/bin/npx"
+  ln -s /usr/bin/uvx "$pkgdir/usr/lib/$pkgname/resources/bin/uvx"
+  ln -s /usr/bin/npx "$pkgdir/usr/lib/$pkgname/resources/bin/npx"
+
   # Install wrapper script, desktop file, and icons
   install -Dm755 "$startdir/goose-desktop.sh" "$pkgdir/usr/bin/$pkgname"
   install -Dm644  ui/desktop/out/Goose-linux-x64/resources/images/icon.png "$pkgdir/usr/share/pixmaps/$pkgname.png"