Revert "Ensure we are using our desktop integration bundled with runt…

…ime content" This reverts commit c43fe13.
canonical · Oct 10, 2024 · 696ef98 · 696ef98
1 parent b38db8e
commit 696ef98
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/snapcraft/extensions/kde_neon_6.py b/snapcraft/extensions/kde_neon_6.py
@@ -93,7 +93,7 @@ def is_experimental(base: Optional[str]) -> bool:
 
     @overrides
     def get_app_snippet(self) -> Dict[str, Any]:
-        command_chain = ["$SNAP/kf6/snap/command-chain/desktop-launch6"]
+        command_chain = ["snap/command-chain/desktop-launch6"]
         if self.yaml_data["base"] == "core24":
             command_chain.insert(0, "snap/command-chain/gpu-2404-wrapper")
         return {
@@ -245,7 +245,7 @@ def get_root_snippet(self) -> Dict[str, Any]:
             "hooks": {
                 "configure": {
                     "plugs": ["desktop"],
-                    "command-chain": ["$SNAP/kf6/snap/command-chain/hooks-configure-desktop"],
+                    "command-chain": ["snap/command-chain/hooks-configure-desktop"],
                 }
             },
             "layout": {

diff --git a/tests/unit/extensions/test_kde_neon_6.py b/tests/unit/extensions/test_kde_neon_6.py
@@ -134,7 +134,7 @@ def test_is_experimental():
 
 def test_get_app_snippet(kde_neon_6_extension):
     assert kde_neon_6_extension.get_app_snippet() == {
-        "command-chain": ["$SNAP/kf6/snap/command-chain/desktop-launch6"],
+        "command-chain": ["snap/command-chain/desktop-launch6"],
         "plugs": [
             "desktop",
             "desktop-legacy",
@@ -153,7 +153,7 @@ def test_get_app_snippet_core24(kde_neon_6_extension_core24):
     assert kde_neon_6_extension_core24.get_app_snippet() == {
         "command-chain": [
             "snap/command-chain/gpu-2404-wrapper",
-            "$SNAP/kf6/snap/command-chain/desktop-launch6",
+            "snap/command-chain/desktop-launch6",
         ],
         "plugs": [
             "desktop",
@@ -177,7 +177,7 @@ def test_get_root_snippet(kde_neon_6_extension):
         "hooks": {
             "configure": {
                 "plugs": ["desktop"],
-                "command-chain": ["$SNAP/kf6/snap/command-chain/hooks-configure-desktop"],
+                "command-chain": ["snap/command-chain/hooks-configure-desktop"],
             }
         },
         "layout": {
@@ -250,7 +250,7 @@ def test_get_root_snippet_core24(kde_neon_6_extension_core24):
         "hooks": {
             "configure": {
                 "plugs": ["desktop"],
-                "command-chain": ["$SNAP/kf6/snap/command-chain/hooks-configure-desktop"],
+                "command-chain": ["snap/command-chain/hooks-configure-desktop"],
             }
         },
         "layout": {
@@ -348,7 +348,7 @@ def test_get_root_snippet_with_external_sdk(kde_neon_6_extension_with_build_snap
         "hooks": {
             "configure": {
                 "plugs": ["desktop"],
-                "command-chain": ["$SNAP/kf6/snap/command-chain/hooks-configure-desktop"],
+                "command-chain": ["snap/command-chain/hooks-configure-desktop"],
             }
         },
         "layout": {
@@ -423,7 +423,7 @@ def test_get_root_snippet_with_external_sdk_core24(
         "hooks": {
             "configure": {
                 "plugs": ["desktop"],
-                "command-chain": ["$SNAP/kf6/snap/command-chain/hooks-configure-desktop"],
+                "command-chain": ["snap/command-chain/hooks-configure-desktop"],
             }
         },
         "layout": {