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;
e02584b456a3f9c00b303ef4815d892a47edc2e6'/><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=e02584b456a3f9c00b303ef4815d892a47edc2e6'>root</a>/<a href='/guix/log/gnu?id=e02584b456a3f9c00b303ef4815d892a47edc2e6'>gnu</a>/<a href='/guix/log/gnu/packages?id=e02584b456a3f9c00b303ef4815d892a47edc2e6'>packages</a>/<a href='/guix/log/gnu/packages/myrddin.scm?id=e02584b456a3f9c00b303ef4815d892a47edc2e6'>myrddin.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/gnu/packages/myrddin.scm?id=e02584b456a3f9c00b303ef4815d892a47edc2e6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-01-14 22:14:56 +0100'>2022-01-14</span></td><td><a href='/guix/commit/gnu/packages/myrddin.scm?id=564d4e1b3c2017bb90f61173ef5ae84e8fa7aa6c'>gnu: Add myrddin.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/local.mk (GNU_SYSTEM_MODULES): Add myrddin.scm.
* gnu/packages/myrddin.scm: New file.

Co-authored-by: jgart &lt;jgart@dismail.de&gt;
Co-authored-by: Jorge Acereda &lt;jacereda@gmail.com&gt;
Co-authored-by: Raghav Gururajan &lt;rg@raghavgururajan.name&gt;
Signed-off-by: Nicolas Goaziou &lt;mail@nicolasgoaziou.fr&gt;
</span></span></td><td>Guix Together</td></tr>
avail'>...<span class='msg-tooltip'>* guix/import/cran.scm (format-inputs): Emit symbols or
'specification-&gt;package' calls.
(maybe-inputs): Wrap in 'list' instead of 'quasiquote'.
* tests/cran.scm ("description-&gt;package"): Adjust accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-01-16 23:14:05 +0100'>2020-01-16</span></td><td><a href='/guix/commit/tests/cran.scm?id=cfd1ed84013df85f0e473884ef4038b4bd7120d4'>import: cran: Avoid uses of '@@' in the tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/cran.scm (description-&gt;alist, description-&gt;package): Export.
&lt;top level&gt;: Set! 'listify'.
* tests/cran.scm (description-alist, "description-&gt;package"): Remove use
of '@@' to access the relevant bindings.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-13 12:40:20 +0200'>2017-05-13</span></td><td><a href='/guix/commit/tests/cran.scm?id=db427602d8f993ee0025fa68d1af274aa8d69ab9'>import: cran: Robustify cran-package?.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/cran.scm (package-&gt;upstream-name): Return #f if url
  start and end index could not be determined.
  (cran-package?): Check if the upstream-name can be extracted from
  given package.
* tests/cran.scm: Add "r-minimal is not a cran package" to make sure that
  r-minimal is not detected as a cran package.

This fixes a failure of guix refresh on r-minimal because no
upsteam-name can be determined from ".../R-version.tar.gz" uri.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2017-03-08 23:42:52 +0100'>2017-03-08</span></td><td><a href='/guix/commit/tests/cran.scm?id=dd420bf3430eb644b93ca224da4c0a3f5db7a42f'>tests: Avoid zero-expression 'begin' form.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/cran.scm ("description-&gt;package"): Add body after the expected
pattern in 'match'.
</span></span></td><td>Ludovic Courtès</td></tr>