Flatpak writes files for installed applications with the full Flatpak (store) path. This patch makes it write just "flatpak", using Flatpak from PATH. This is similar to the NixOS [0] patch, updated for Flatpak 1.12.1

[0] https://github.com/NixOS/nixpkgs/blob/bf4167861d0f864b0fc457778d54feb4a2675ea2/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch

diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 80ff5e5f..0c111c31 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -7134,8 +7134,7 @@ export_desktop_file (const char         *app,
         flatpak = FLATPAK_BINDIR "/flatpak";

       g_string_append_printf (new_exec,
-                              "%s run --branch=%s --arch=%s",
-                              flatpak,
+                              "flatpak run --branch=%s --arch=%s",
                               escaped_branch,
                               escaped_arch);

@@ -8467,8 +8466,8 @@ flatpak_dir_deploy (FlatpakDir          *self,
       if ((flatpak = g_getenv ("FLATPAK_BINARY")) == NULL)
         flatpak = FLATPAK_BINDIR "/flatpak";

-      bin_data = g_strdup_printf ("#!/bin/sh\nexec %s run --branch=%s --arch=%s %s \"$@\"\n",
-                                  flatpak, escaped_branch, escaped_arch, escaped_app);
+      bin_data = g_strdup_printf ("#!/bin/sh\nexec flatpak run --branch=%s --arch=%s %s \"$@\"\n",
+                                  escaped_branch, escaped_arch, escaped_app);
       if (!g_file_replace_contents (wrapper, bin_data, strlen (bin_data), NULL, FALSE,
                                     G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error))
         return FALSE;
td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/gdm-elogind-support.patch'>
<input type='hidden' name='id' value='f420d99a7df7a66262b9403fb29e99eab42a6135'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=f420d99a7df7a66262b9403fb29e99eab42a6135'>root</a>/<a href='/guix/log/gnu?id=f420d99a7df7a66262b9403fb29e99eab42a6135'>gnu</a>/<a href='/guix/log/gnu/packages?id=f420d99a7df7a66262b9403fb29e99eab42a6135'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=f420d99a7df7a66262b9403fb29e99eab42a6135'>patches</a>/<a href='/guix/log/gnu/packages/patches/gdm-elogind-support.patch?id=f420d99a7df7a66262b9403fb29e99eab42a6135'>gdm-elogind-support.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/gdm-elogind-support.patch?id=f420d99a7df7a66262b9403fb29e99eab42a6135&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-09-13 00:20:35 -0400'>2022-09-13</span></td><td><a href='/guix/commit/gnu/packages/patches/gdm-elogind-support.patch?id=97313b9b0c5d5977e66f318345523f5a2f3117e5'>gnu: gdm: Update to 42.0.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>