From a24962007b607d7b38ebe3c3624f4bcbbbb7fa2e Mon Sep 17 00:00:00 2001
From: Javier Feliz <javier0eduardo@hotmail.com>
Date: Sun, 7 Sep 2025 20:44:25 -0400
Subject: [PATCH] Try and fix gtk runtime

---
 .gitignore | 2 ++
 flake.nix  | 9 ++++++---
 result     | 1 -
 3 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 120000 result

diff --git a/.gitignore b/.gitignore
index 12ef810..7a23d5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ waycast_cache
 waycast.toml
 # Using locally to test .config, .cache, and data dir
 xdg
+# For when I have to test nix builds
+result
diff --git a/flake.nix b/flake.nix
index 9708b94..c76075b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,6 +39,7 @@
           nativeBuildInputs = with pkgs; [
             pkg-config
             makeWrapper
+            wrapGAppsHook4
           ];
 
           buildInputs = with pkgs; [
@@ -56,10 +57,12 @@
             gtk4-layer-shell
           ];
 
-          # Wrap binary to ensure icon themes are available
-          postInstall = ''
-            wrapProgram $out/bin/waycast \
+          # wrapGAppsHook4 handles most GTK runtime setup automatically
+          # Just ensure icon themes are available
+          preFixup = ''
+            gappsWrapperArgs+=(
               --prefix XDG_DATA_DIRS : "${pkgs.hicolor-icon-theme}/share:${pkgs.adwaita-icon-theme}/share"
+            )
           '';
 
           meta = with pkgs.lib; {
diff --git a/result b/result
deleted file mode 120000
index a51e70b..0000000
--- a/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/x09nhxzjwgzvslcfb8y2jy7ajwmb1kvc-waycast-0.0.1
\ No newline at end of file