diff --git a/pkgs/by-name/or/orca/fix-paths.patch b/pkgs/by-name/or/orca/fix-paths.patch index 49142eed47d9..8cb8d9406307 100644 --- a/pkgs/by-name/or/orca/fix-paths.patch +++ b/pkgs/by-name/or/orca/fix-paths.patch @@ -38,33 +38,33 @@ index 3fc845dc3..a82947911 100755 stdout=subprocess.PIPE) as proc: pids = proc.stdout.read() if proc.stdout else b"" diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py -index 3407be009..452297a3f 100644 +index 098b0a033..e7b040d82 100644 --- a/src/orca/orca_modifier_manager.py +++ b/src/orca/orca_modifier_manager.py -@@ -230,7 +230,7 @@ class OrcaModifierManager: - debug.print_message(debug.LEVEL_INFO, msg, True) +@@ -236,7 +236,7 @@ class OrcaModifierManager: + return self.unset_orca_modifiers(reason) -- with subprocess.Popen(["xkbcomp", os.environ["DISPLAY"], "-"], -+ with subprocess.Popen(["@xkbcomp@", os.environ["DISPLAY"], "-"], +- with subprocess.Popen(["xkbcomp", display, "-"], ++ with subprocess.Popen(["@xkbcomp@", display, "-"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) as p: self._original_xmodmap, _ = p.communicate() self._create_orca_xmodmap() -@@ -262,7 +262,7 @@ class OrcaModifierManager: +@@ -274,7 +274,7 @@ class OrcaModifierManager: return self._caps_lock_cleared = False -- with subprocess.Popen(["xkbcomp", "-w0", "-", os.environ["DISPLAY"]], -+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", os.environ["DISPLAY"]], +- with subprocess.Popen(["xkbcomp", "-w0", "-", display], ++ with subprocess.Popen(["@xkbcomp@", "-w0", "-", display], stdin=subprocess.PIPE, stdout=None, stderr=None) as p: p.communicate(self._original_xmodmap) -@@ -325,7 +325,7 @@ class OrcaModifierManager: +@@ -349,7 +349,7 @@ class OrcaModifierManager: debug.print_message(debug.LEVEL_INFO, msg, True) -- with subprocess.Popen(["xkbcomp", "-w0", "-", os.environ["DISPLAY"]], -+ with subprocess.Popen(["@xkbcomp@", "-w0", "-", os.environ["DISPLAY"]], +- with subprocess.Popen(["xkbcomp", "-w0", "-", display], ++ with subprocess.Popen(["@xkbcomp@", "-w0", "-", display], stdin=subprocess.PIPE, stdout=None, stderr=None) as p: p.communicate(bytes('\n'.join(lines), 'UTF-8')) else: diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 2016bd025d7d..7d0482be0f00 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -31,13 +31,13 @@ python3.pkgs.buildPythonApplication rec { pname = "orca"; - version = "49.4"; + version = "49.5"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz"; - hash = "sha256-trpMxYeEEcNKfVt+6bLFybHQSt0Qv9IPbiMx1ZQWUgc="; + hash = "sha256-U99BVYMZ6XwehK1gSYmVegK10P9TFBkZDwWH6mslYDQ="; }; patches = [