extensions: simplifies the platform plug

canonical · Oct 10, 2024 · 3d267d3 · 3d267d3
1 parent fa644b4
commit 3d267d3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/extensions/desktop/command-chain/Makefile b/extensions/desktop/command-chain/Makefile
@@ -6,6 +6,7 @@ GPU_WRAPPER :=
 scripts = hooks-configure-fonts desktop-launch run $(GPU_WRAPPER)
 
 *:
+	sed -e "s/%PLATFORM_PLUG%/$${PLATFORM_PLUG:?}/" -i desktop-launch hooks-configure-fonts
 	install -D -m755 "$@" "$(BIN_DIR)"/"$@"
 
 install: $(scripts)

diff --git a/extensions/desktop/command-chain/desktop-launch b/extensions/desktop/command-chain/desktop-launch
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-set -- "${SNAP}/gnome-platform/command-chain/desktop-launch" "$@"
+set -- "${SNAP}/%PLATFORM_PLUG%/command-chain/desktop-launch" "$@"
 # shellcheck source=/dev/null
 source "${SNAP}/snap/command-chain/run"
diff --git a/extensions/desktop/command-chain/hooks-configure-fonts b/extensions/desktop/command-chain/hooks-configure-fonts
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-set -- "${SNAP}/gnome-platform/command-chain/hooks-configure-fonts" "$@"
+set -- "${SNAP}/%PLATFORM_PLUG%/command-chain/hooks-configure-fonts" "$@"
 # shellcheck source=/dev/null
 source "${SNAP}/snap/command-chain/run"
diff --git a/snapcraft/extensions/gnome.py b/snapcraft/extensions/gnome.py
@@ -330,6 +330,7 @@ def get_parts_snippet(self) -> Dict[str, Any]:
                     "source": str(source),
                     "plugin": "make",
                     "build-snaps": [sdk_snap],
+                    "make-parameters": ["PLATFORM_PLUG=gnome-platform"],
                     **gpu_opts,
                 },
             }