From fa8183561aa699b4c804ab2123457af3a30868e3 Mon Sep 17 00:00:00 2001
From: Niko Marmeladkov <niko@n1kt.ru>
Date: Sat, 30 May 2026 11:01:25 +0300
Subject: [PATCH] PKGBUILD: use patch file for nim-dbus dtBool fix

---
 PKGBUILD              | 15 ++++++---------
 nim-dbus-dtbool.patch | 11 +++++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 nim-dbus-dtbool.patch

diff --git a/PKGBUILD b/PKGBUILD
index b746ef8..fa333ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,21 +18,18 @@ prepare() {
   cd "$srcdir/$_repodir"
   nimble install -y --depsOnly --nimbleDir:"$srcdir/nimble" 2>/dev/null || true
   export NIMBLE_DIR="$srcdir/nimble"
-  # patch nim-dbus: add dtBool to getPrimitive, nil-safe $ for DbusType
-  local dbus_val="$NIMBLE_DIR/pkgs2/$(ls "$NIMBLE_DIR/pkgs2" | grep '^dbus-')/dbus/private/value.nim"
-  local dbus_typ="$NIMBLE_DIR/pkgs2/$(ls "$NIMBLE_DIR/pkgs2" | grep '^dbus-')/dbus/private/types.nim"
-  if ! grep -q 'of dtBool:' "$dbus_val" 2>/dev/null; then
-    sed -i '/^  of dtDouble:/i\  of dtBool:\n    return addr val.boolValue' "$dbus_val"
-  fi
-  if ! grep -q 'isNil' "$dbus_typ" 2>/dev/null; then
-    sed -i '/^proc `\$`\*(t: DbusType): string =/a\  if t.isNil:\n    return "\<nil\>"' "$dbus_typ"
+  # patch nim-dbus: add dtBool to getPrimitive
+  local dbus_dir="$NIMBLE_DIR/pkgs2/$(ls "$NIMBLE_DIR/pkgs2" | grep '^dbus-')"
+  if ! grep -q 'of dtBool' "$dbus_dir/dbus/private/value.nim" 2>/dev/null; then
+    patch -d "$dbus_dir" -p1 < "$srcdir/$_repodir/nim-dbus-dtbool.patch"
   fi
 }
 
 build() {
   cd "$srcdir/$_repodir"
   export NIMBLE_DIR="$srcdir/nimble"
-  export HOME="$srcdir"  # isolate nim cache
+  # fresh nimcache to force recompile patched deps
+  rm -rf "$srcdir/nimcache"
   nim c \
     --path:"$NIMBLE_DIR/pkgs2" \
     --nimcache:"$srcdir/nimcache" \
diff --git a/nim-dbus-dtbool.patch b/nim-dbus-dtbool.patch
new file mode 100644
index 0000000..11950cc
--- /dev/null
+++ b/nim-dbus-dtbool.patch
@@ -0,0 +1,11 @@
+--- a/dbus/private/value.nim
++++ b/dbus/private/value.nim
+@@ -93,6 +93,8 @@ type DbusNativePrimitive = bool | float64 | int32 | int16 | uint16 | uint64 | ui
+ 
+ proc getPrimitive(val: DbusValue): pointer =
+   case val.kind
++  of dtBool:
++    return addr val.uint32Value
+   of dtDouble:
+     return addr val.doubleValue
+   of dtInt32: