pkgs/development/libraries/flatpak/use-flatpak-from-path.patch at release-19.03

tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
nixpkgs / pkgs / development / libraries / flatpak / use-flatpak-from-path.patch
at release-19.03 48 lines 3.1 kB view raw
wrap content
 1--- a/common/flatpak-dir.c
 2+++ b/common/flatpak-dir.c
 3@@ -5758,7 +5758,7 @@ export_desktop_file (const char   *app,
 4 
 5       new_exec = g_string_new ("");
 6       g_string_append_printf (new_exec,
 7-                              FLATPAK_BINDIR "/flatpak run --branch=%s --arch=%s",
 8+                              "flatpak run --branch=%s --arch=%s",
 9                               escaped_branch,
10                               escaped_arch);
11 
12@@ -6935,8 +6935,8 @@ flatpak_dir_deploy (FlatpakDir          *self,
13                                        error))
14         return FALSE;
15 
16-      bin_data = g_strdup_printf ("#!/bin/sh\nexec %s/flatpak run --branch=%s --arch=%s %s \"$@\"\n",
17-                                  FLATPAK_BINDIR, escaped_branch, escaped_arch, escaped_app);
18+      bin_data = g_strdup_printf ("#!/bin/sh\nexec flatpak run --branch=%s --arch=%s %s \"$@\"\n",
19+                                  escaped_branch, escaped_arch, escaped_app);
20       if (!g_file_replace_contents (wrapper, bin_data, strlen (bin_data), NULL, FALSE,
21                                     G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error))
22         return FALSE;
23diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh
24index 6937b041..01f8add7 100755
25--- a/tests/test-bundle.sh
26+++ b/tests/test-bundle.sh
27@@ -59,7 +59,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files
28 assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export
29 assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop
30 # Ensure Exec key is rewritten
31-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$"
32+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$"
33 assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
34 assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png
35 
36diff --git a/tests/test-run.sh b/tests/test-run.sh
37index 9d83d82e..234e4ec6 100755
38--- a/tests/test-run.sh
39+++ b/tests/test-run.sh
40@@ -42,7 +42,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files
41 assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export
42 assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop
43 # Ensure Exec key is rewritten
44-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$"
45+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$"
46 assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png
47 assert_not_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/dont-export.png
48 assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png