From 402ff9d7381f16f31905fb85f084bc83d93b5cb3 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 2 Feb 2017 09:18:29 +0100 Subject: [PATCH] build: Set FLATPAK_DEST to the mountpoint we're building into --- app/flatpak-builtins-build.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/flatpak-builtins-build.c b/app/flatpak-builtins-build.c index f8dae0c7..cf55cfcd 100644 --- a/app/flatpak-builtins-build.c +++ b/app/flatpak-builtins-build.c @@ -93,6 +93,7 @@ flatpak_builtin_build (int argc, char **argv, GCancellable *cancellable, GError g_auto(GStrv) runtime_ref_parts = NULL; FlatpakRunFlags run_flags; const char *group = NULL; + const char *dest = NULL; gboolean is_app = FALSE; gboolean is_extension = FALSE; gboolean is_app_extension = FALSE; @@ -297,6 +298,17 @@ flatpak_builtin_build (int argc, char **argv, GCancellable *cancellable, GError "--bind", flatpak_file_get_path_cached (res_files), extension_point, NULL); + if (extension_point) + dest = extension_point; + else if (is_app) + dest = g_strdup ("/app"); + else + dest = g_strdup ("/usr"); + + add_args (argv_array, + "--setenv", "FLATPAK_DEST", dest, + NULL); + /* After setup_base to avoid conflicts with /var symlinks */ add_args (argv_array, "--bind", flatpak_file_get_path_cached (var), "/var",