about summary refs log tree commit diff
path: root/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch
blob: e27847378bb21a99e22cb05b8e882d4fe0454e00 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
diff --git a/data/org.gnome.Shell-disable-extensions.service b/data/org.gnome.Shell-disable-extensions.service
index de91167c5..1c9965678 100644
--- a/data/org.gnome.Shell-disable-extensions.service
+++ b/data/org.gnome.Shell-disable-extensions.service
@@ -11,5 +11,5 @@ ConditionPathExists=%t/gnome-shell-disable-extensions
 [Service]
 Type=simple
 # Disable extensions
-ExecStart=gsettings set org.gnome.shell disable-user-extensions true
+ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true
 Restart=no
diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index 197cc1c1c..dd74aa167 100644
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -110,7 +110,7 @@ async function extractExtensionArchive(bytes, dir) {
     stream.close_async(GLib.PRIORITY_DEFAULT, null);
 
     const unzip = Gio.Subprocess.new(
-        ['unzip', '-uod', dir.get_path(), '--', file.get_path()],
+        ['@unzip@', '-uod', dir.get_path(), '--', file.get_path()],
         Gio.SubprocessFlags.NONE);
     await unzip.wait_check_async(null);
 
@@ -132,7 +132,7 @@ async function extractExtensionArchive(bytes, dir) {
     }
 
     const compileSchema = Gio.Subprocess.new(
-        ['glib-compile-schemas', '--strict', schemasPath.get_path()],
+        ['@glib_compile_schemas@', '--strict', schemasPath.get_path()],
         Gio.SubprocessFlags.NONE);
 
     try {
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index fff4e73c2..92859b099 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -1092,6 +1092,6 @@ class InputSourceIndicator extends PanelMenu.Button {
         if (xkbVariant.length > 0)
             description = `${description}\t${xkbVariant}`;
 
-        Util.spawn(['tecla', description]);
+        Util.spawn(['@tecla@', description]);
     }
 });
diff --git a/subprojects/extensions-tool/src/command-install.c b/subprojects/extensions-tool/src/command-install.c
index 11fb4b6b7..e00e4807b 100644
--- a/subprojects/extensions-tool/src/command-install.c
+++ b/subprojects/extensions-tool/src/command-install.c
@@ -158,7 +158,7 @@ install_extension (const char *bundle,
 
       schemapath = g_file_get_path (schemadir);
       proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, &error,
-                               "glib-compile-schemas", "--strict", schemapath,
+                               "@glib_compile_schemas@", "--strict", schemapath,
                                NULL);
 
       if (!g_subprocess_wait_check (proc, NULL, &error))
diff --git a/subprojects/extensions-tool/src/command-pack.c b/subprojects/extensions-tool/src/command-pack.c
index f2cfcd51a..2a9a7efdf 100644
--- a/subprojects/extensions-tool/src/command-pack.c
+++ b/subprojects/extensions-tool/src/command-pack.c
@@ -168,7 +168,7 @@ extension_pack_add_schemas (ExtensionPack  *pack,
 #else
   dstpath = g_file_get_path (dstdir);
   proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDERR_SILENCE, error,
-                           "glib-compile-schemas", "--strict", dstpath, NULL);
+                           "@glib_compile_schemas@", "--strict", dstpath, NULL);
 
   if (!g_subprocess_wait_check (proc, NULL, error))
     return FALSE;