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