diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-02-22 10:43:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-11 16:17:56 +0000 |
| commit | ca1aada113c0ebda1ab8667199f6453f8e01c4fc (patch) | |
| tree | 55e402280096f62eb0bc8bcad5ce6050c5a0aec7 /nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch | |
| parent | e4df5a52a6a6531f32626f57205356a773ac2975 (diff) | |
| parent | 93883402a445ad467320925a0a5dbe43a949f25b (diff) | |
| download | nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.gz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.bz2 nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.lz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.xz nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.tar.zst nixlib-ca1aada113c0ebda1ab8667199f6453f8e01c4fc.zip | |
Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'
Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch b/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch new file mode 100644 index 000000000000..402f78ed04b1 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch @@ -0,0 +1,32 @@ +diff --git a/nautilus_open_any_terminal/open_any_terminal_extension.py b/nautilus_open_any_terminal/open_any_terminal_extension.py +index b02a995..a616399 100644 +--- a/nautilus_open_any_terminal/open_any_terminal_extension.py ++++ b/nautilus_open_any_terminal/open_any_terminal_extension.py +@@ -125,9 +125,10 @@ def set_terminal_args(*args): + + class OpenAnyTerminalShortcutProvider(GObject.GObject, Nautilus.LocationWidgetProvider): + def __init__(self): +- source = Gio.SettingsSchemaSource.get_default() +- if source.lookup(GSETTINGS_PATH, True): +- self._gsettings = Gio.Settings.new(GSETTINGS_PATH) ++ source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) ++ if True: ++ _schema = source.lookup(GSETTINGS_PATH, False) ++ self._gsettings = Gio.Settings.new_full(_schema, None, None); + self._gsettings.connect("changed", self._bind_shortcut) + self._create_accel_group() + self._window = None +@@ -232,9 +233,10 @@ class OpenAnyTerminalExtension(GObject.GObject, Nautilus.MenuProvider): + return items + + +-source = Gio.SettingsSchemaSource.get_default() +-if source is not None and source.lookup(GSETTINGS_PATH, True): +- _gsettings = Gio.Settings.new(GSETTINGS_PATH) ++source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) ++if True: ++ _schema = source.lookup(GSETTINGS_PATH, False) ++ _gsettings = Gio.Settings.new_full(_schema, None, None); + _gsettings.connect("changed", set_terminal_args) + value = _gsettings.get_string(GSETTINGS_TERMINAL) + if value in TERM_PARAMS: |