diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch')
-rw-r--r-- | nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch index e17a608a2d85..8b35736ecfcd 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch @@ -1,30 +1,36 @@ +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 8bf4646a6..59e88bb4c 100644 --- a/js/ui/extensionDownloader.js +++ b/js/ui/extensionDownloader.js -@@ -86,7 +86,7 @@ - stream.output_stream.write_bytes(contents, null); - stream.close(null); - let [success, pid] = GLib.spawn_async(null, -- ['unzip', '-uod', dir.get_path(), '--', file.get_path()], -+ ['@unzip@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], - null, - GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD, - null); +@@ -114,7 +114,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@/bin/unzip', '-uod', dir.get_path(), '--', file.get_path()], + Gio.SubprocessFlags.NONE); + await unzip.wait_check_async(null); + } +diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js +index bc50f3d37..868eb5abf 100644 --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js -@@ -1062,6 +1062,6 @@ class InputSourceIndicator extends PanelMenu.Button { +@@ -1080,6 +1080,6 @@ class InputSourceIndicator extends PanelMenu.Button { if (xkbVariant.length > 0) - description = `${description}\t${xkbVariant}`; + description = '%s\t%s'.format(description, xkbVariant); - Util.spawn(['gkbd-keyboard-display', '-l', description]); + Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]); } }); ---- a/data/org.gnome.Shell-disable-extensions.service -+++ b/data/org.gnome.Shell-disable-extensions.service -@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer - [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 |