diff options
author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-07-19 10:52:59 +0200 |
---|---|---|
committer | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-08-02 20:00:19 +0200 |
commit | e5e91efa4cef9291834383ba5a4720e838f7bb1c (patch) | |
tree | 53c112e1a869985002d94b4303d47979ca3a438c /pkgs/development/libraries/flatpak/use-flatpak-from-path.patch | |
parent | 3af85571bf8062b5a7a6b884df0dbaa4d9008f54 (diff) | |
download | nixpkgs-e5e91efa4cef9291834383ba5a4720e838f7bb1c.tar nixpkgs-e5e91efa4cef9291834383ba5a4720e838f7bb1c.tar.gz nixpkgs-e5e91efa4cef9291834383ba5a4720e838f7bb1c.tar.bz2 nixpkgs-e5e91efa4cef9291834383ba5a4720e838f7bb1c.tar.lz nixpkgs-e5e91efa4cef9291834383ba5a4720e838f7bb1c.tar.xz nixpkgs-e5e91efa4cef9291834383ba5a4720e838f7bb1c.tar.zst nixpkgs-e5e91efa4cef9291834383ba5a4720e838f7bb1c.zip |
flatpak: Don't hardcode flatpak binary path in launchers
The hardcoded flatpak path breaks all installed applications when flatpak is updated. fixes: https://github.com/NixOS/nixpkgs/issues/43581
Diffstat (limited to 'pkgs/development/libraries/flatpak/use-flatpak-from-path.patch')
-rw-r--r-- | pkgs/development/libraries/flatpak/use-flatpak-from-path.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch new file mode 100644 index 00000000000..e855902a930 --- /dev/null +++ b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch @@ -0,0 +1,48 @@ +--- a/common/flatpak-dir.c ++++ b/common/flatpak-dir.c +@@ -5467,7 +5467,7 @@ export_desktop_file (const char *app, + + new_exec = g_string_new (""); + g_string_append_printf (new_exec, +- FLATPAK_BINDIR "/flatpak run --branch=%s --arch=%s", ++ "flatpak run --branch=%s --arch=%s", + escaped_branch, + escaped_arch); + +@@ -6644,8 +6644,8 @@ flatpak_dir_deploy (FlatpakDir *self, + error)) + return FALSE; + +- bin_data = g_strdup_printf ("#!/bin/sh\nexec %s/flatpak run --branch=%s --arch=%s %s \"$@\"\n", +- FLATPAK_BINDIR, 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; +diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh +index 6937b041..01f8add7 100755 +--- a/tests/test-bundle.sh ++++ b/tests/test-bundle.sh +@@ -59,7 +59,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files + assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export + assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop + # Ensure Exec key is rewritten +-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$" ++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$" + assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png + assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png + +diff --git a/tests/test-run.sh b/tests/test-run.sh +index 9d83d82e..234e4ec6 100755 +--- a/tests/test-run.sh ++++ b/tests/test-run.sh +@@ -42,7 +42,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files + assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export + assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop + # Ensure Exec key is rewritten +-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$" ++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$" + assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png + assert_not_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/dont-export.png + assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png |