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;
'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=32523ddf4d266b18911dc1aa07d375e9cffb2efe'>root</a>/<a href='/guix/log/tests?id=32523ddf4d266b18911dc1aa07d375e9cffb2efe'>tests</a>/<a href='/guix/log/tests/grafts.scm?id=32523ddf4d266b18911dc1aa07d375e9cffb2efe'>grafts.scm</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/tests/grafts.scm?id=32523ddf4d266b18911dc1aa07d375e9cffb2efe&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-11-11 23:17:42 +0100'>2022-11-11</span></td><td><a href='/guix/commit/tests/grafts.scm?id=19206eee69e8c22d63104af1b7f1f815969bff7f'>grafts: Run with a UTF-8 locale.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/55968&gt;.
Reported by Maxime Devos &lt;maximedevos@telenet.be&gt;.

* guix/grafts.scm (%graft-with-utf8-locale?): New parameter.
(graft-derivation/shallow)[glibc-locales, set-utf8-locale]: New
variables.
[build]: Use 'set-utf8-locale'.
* tests/gexp.scm, tests/grafts.scm, tests/packages.scm: Set
'%graft-with-utf8-locale?' to #f.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-04-15 03:22:55 -0400'>2021-04-15</span></td><td><a href='/guix/commit/tests/grafts.scm?id=1bab9b9f17256a9e4f45f5b0cceb8b52e0a1b1ed'>grafts: Support rewriting UTF-16 and UTF-32 store references.</a><span class='msg-avail'>...<span class='msg-tooltip'>Partially fixes &lt;https://bugs.gnu.org/33848&gt;.

* guix/build/graft.scm (replace-store-references): Add support for
finding and rewriting UTF-16 and UTF-32 store references.
* tests/grafts.scm: Add tests.
</span></span></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2019-06-27 23:33:48 +0200'>2019-06-27</span></td><td><a href='/guix/commit/tests/grafts.scm?id=5cc1075a76392666d3d733837f5c6252b1e48002'>Merge branch 'master' into core-updates</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-06-27 11:14:41 +0200'>2019-06-27</span></td><td><a href='/guix/commit/tests/grafts.scm?id=c89985d91d2b44704fbcaebd7a097dee0c0e3e4a'>derivations: Add 'derivation-input'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/derivations.scm (derivation-input): New procedure.
* tests/grafts.scm (make-derivation-input): Remove.
("graft-derivation, unused outputs not depended on"): Use
'derivation-input'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-06-14 21:57:39 +0200'>2019-06-14</span></td><td><a href='/guix/commit/tests/grafts.scm?id=1ba0b1e6ec41afd94a3c5f907b1122204dcb5d9d'>packages: Remove 'search-bootstrap-binary'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages.scm (%bootstrap-binaries-path, search-bootstrap-binary):
Remove.
* gnu/packages/bootstrap.scm (bootstrap-executable): Export.
* guix/tests.scm (bootstrap-binary-file, search-bootstrap-binary):
Export.
* tests/derivations.scm: Remove (gnu packages) import.
* tests/grafts.scm: Likewise.
* tests/guix-daemon.sh: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-11-28 10:39:58 +0100'>2018-11-28</span></td><td><a href='/guix/commit/tests/grafts.scm?id=64fd1c01bc6f1be6ffcafc08789d5dafb9850c2e'>grafts: Record metadata as derivation properties.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/grafts.scm (graft-derivation/shallow): Pass #:properties to
'build-expression-&gt;derivation'.
* tests/grafts.scm ("graft-derivation, grafted item is a direct
dependency"): Check the value returned by 'derivation-properties'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-08-24 23:55:51 +0200'>2017-08-24</span></td><td><a href='/guix/commit/tests/grafts.scm?id=94e86a6b67c7a02f5f11358743f3b9f11997059c'>graft: Correctly replace references near the end of the scan buffer.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;http://bugs.gnu.org/28212&gt;.
Reported by Leo Famulari &lt;leo@famulari.name&gt;.

* guix/build/graft.scm (replace-store-references): When I &gt;= END, check
whether WRITTEN &gt; END and call 'get-bytevector-n!' when it is.
* tests/grafts.scm (buffer-size): New variable.
("replace-store-references, &lt;http://bugs.gnu.org/28212&gt;"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>