tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
2index 52b222ea..9489441f 100644
3--- a/common/flatpak-dir.c
4+++ b/common/flatpak-dir.c
5@@ -6956,7 +6956,7 @@ export_desktop_file (const char *app,
6
7 new_exec = g_string_new ("");
8 g_string_append_printf (new_exec,
9- FLATPAK_BINDIR "/flatpak run --branch=%s --arch=%s",
10+ "flatpak run --branch=%s --arch=%s",
11 escaped_branch,
12 escaped_arch);
13
14@@ -8290,8 +8290,8 @@ flatpak_dir_deploy (FlatpakDir *self,
15 error))
16 return FALSE;
17
18- bin_data = g_strdup_printf ("#!/bin/sh\nexec %s/flatpak run --branch=%s --arch=%s %s \"$@\"\n",
19- FLATPAK_BINDIR, escaped_branch, escaped_arch, escaped_app);
20+ bin_data = g_strdup_printf ("#!/bin/sh\nexec flatpak run --branch=%s --arch=%s %s \"$@\"\n",
21+ escaped_branch, escaped_arch, escaped_app);
22 if (!g_file_replace_contents (wrapper, bin_data, strlen (bin_data), NULL, FALSE,
23 G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error))
24 return FALSE;
25diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh
26index d1682344..5e2b9a97 100755
27--- a/tests/test-bundle.sh
28+++ b/tests/test-bundle.sh
29@@ -67,7 +67,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files
30 assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export
31 assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop
32 # Ensure Exec key is rewritten
33-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
34+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
35 assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
36 assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png
37
38diff --git a/tests/test-run.sh b/tests/test-run.sh
39index fecb756e..64043281 100644
40--- a/tests/test-run.sh
41+++ b/tests/test-run.sh
42@@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files
43 assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/export
44 assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop
45 # Ensure Exec key is rewritten
46-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
47+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$"
48 assert_has_file $FL_DIR/exports/share/gnome-shell/search-providers/org.test.Hello.search-provider.ini
49 assert_file_has_content $FL_DIR/exports/share/gnome-shell/search-providers/org.test.Hello.search-provider.ini "^DefaultDisabled=true$"
50 assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png