uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
115
pkgs/applications/misc/orca/default.nix
Normal file
115
pkgs/applications/misc/orca/default.nix
Normal file
|
|
@ -0,0 +1,115 @@
|
|||
{ lib
|
||||
, pkg-config
|
||||
, fetchurl
|
||||
, buildPythonApplication
|
||||
, autoreconfHook
|
||||
, wrapGAppsHook
|
||||
, gobject-introspection
|
||||
, gettext
|
||||
, yelp-tools
|
||||
, itstool
|
||||
, python
|
||||
, pygobject3
|
||||
, gtk3
|
||||
, gnome
|
||||
, substituteAll
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, pyatspi
|
||||
, dbus
|
||||
, dbus-python
|
||||
, pyxdg
|
||||
, xkbcomp
|
||||
, procps
|
||||
, lsof
|
||||
, coreutils
|
||||
, gsettings-desktop-schemas
|
||||
, speechd
|
||||
, brltty
|
||||
, liblouis
|
||||
, setproctitle
|
||||
, gst_all_1
|
||||
, gst-python
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "orca";
|
||||
version = "42.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "6p6dLehwg4ewUqe+FqXmnOqfZ2jfrrRee9meRmNxYt4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
cat = "${coreutils}/bin/cat";
|
||||
lsof = "${lsof}/bin/lsof";
|
||||
pgrep = "${procps}/bin/pgrep";
|
||||
xkbcomp = "${xkbcomp}/bin/xkbcomp";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
wrapGAppsHook
|
||||
pkg-config
|
||||
gettext
|
||||
yelp-tools
|
||||
itstool
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
pythonPath = [
|
||||
pygobject3
|
||||
pyatspi
|
||||
dbus-python
|
||||
pyxdg
|
||||
brltty
|
||||
liblouis
|
||||
speechd
|
||||
gst-python
|
||||
setproctitle
|
||||
];
|
||||
|
||||
strictDeps = false;
|
||||
|
||||
buildInputs = [
|
||||
python
|
||||
gtk3
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
dbus
|
||||
gsettings-desktop-schemas
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Projects/Orca";
|
||||
description = "Screen reader";
|
||||
longDescription = ''
|
||||
A free, open source, flexible and extensible screen reader that provides
|
||||
access to the graphical desktop via speech and refreshable braille.
|
||||
It works with applications and toolkits that support the Assistive
|
||||
Technology Service Provider Interface (AT-SPI). That includes the GNOME
|
||||
GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and
|
||||
WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued.
|
||||
|
||||
Needs `services.gnome.at-spi2-core.enable = true;` in `configuration.nix`.
|
||||
'';
|
||||
maintainers = with maintainers; [ berce ] ++ teams.gnome.members;
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
84
pkgs/applications/misc/orca/fix-paths.patch
Normal file
84
pkgs/applications/misc/orca/fix-paths.patch
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
diff --git a/src/orca/debug.py b/src/orca/debug.py
|
||||
index e79482ed4..cbf3a24ec 100644
|
||||
--- a/src/orca/debug.py
|
||||
+++ b/src/orca/debug.py
|
||||
@@ -502,7 +502,7 @@ def traceit(frame, event, arg):
|
||||
return traceit
|
||||
|
||||
def getOpenFDCount(pid):
|
||||
- procs = subprocess.check_output([ 'lsof', '-w', '-Ff', '-p', str(pid)])
|
||||
+ procs = subprocess.check_output([ '@lsof@', '-w', '-Ff', '-p', str(pid)])
|
||||
procs = procs.decode('UTF-8').split('\n')
|
||||
files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
|
||||
|
||||
@@ -510,7 +510,7 @@ def getOpenFDCount(pid):
|
||||
|
||||
def getCmdline(pid):
|
||||
try:
|
||||
- openFile = os.popen('cat /proc/%s/cmdline' % pid)
|
||||
+ openFile = os.popen('@cat@ /proc/%s/cmdline' % pid)
|
||||
cmdline = openFile.read()
|
||||
openFile.close()
|
||||
except:
|
||||
@@ -520,7 +520,7 @@ def getCmdline(pid):
|
||||
return cmdline
|
||||
|
||||
def pidOf(procName):
|
||||
- openFile = subprocess.Popen('pgrep %s' % procName,
|
||||
+ openFile = subprocess.Popen('@pgrep@ %s' % procName,
|
||||
shell=True,
|
||||
stdout=subprocess.PIPE).stdout
|
||||
pids = openFile.read()
|
||||
diff --git a/src/orca/orca.py b/src/orca/orca.py
|
||||
index 2fe0a0bf2..087526556 100644
|
||||
--- a/src/orca/orca.py
|
||||
+++ b/src/orca/orca.py
|
||||
@@ -285,7 +285,7 @@ def updateKeyMap(keyboardEvent):
|
||||
|
||||
def _setXmodmap(xkbmap):
|
||||
"""Set the keyboard map using xkbcomp."""
|
||||
- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
|
||||
+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
|
||||
stdin=subprocess.PIPE, stdout=None, stderr=None)
|
||||
p.communicate(xkbmap)
|
||||
|
||||
@@ -363,7 +363,7 @@ def _storeXmodmap(keyList):
|
||||
"""
|
||||
|
||||
global _originalXmodmap
|
||||
- _originalXmodmap = subprocess.check_output(['xkbcomp', os.environ['DISPLAY'], '-'])
|
||||
+ _originalXmodmap = subprocess.check_output(['@xkbcomp@', os.environ['DISPLAY'], '-'])
|
||||
|
||||
def _restoreXmodmap(keyList=[]):
|
||||
"""Restore the original xmodmap values for the keys in keyList.
|
||||
@@ -375,7 +375,7 @@ def _restoreXmodmap(keyList=[]):
|
||||
|
||||
global _capsLockCleared
|
||||
_capsLockCleared = False
|
||||
- p = subprocess.Popen(['xkbcomp', '-w0', '-', os.environ['DISPLAY']],
|
||||
+ p = subprocess.Popen(['@xkbcomp@', '-w0', '-', os.environ['DISPLAY']],
|
||||
stdin=subprocess.PIPE, stdout=None, stderr=None)
|
||||
p.communicate(_originalXmodmap)
|
||||
|
||||
diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
|
||||
index 8c9d40153..eec0d5437 100644
|
||||
--- a/src/orca/orca_bin.py.in
|
||||
+++ b/src/orca/orca_bin.py.in
|
||||
@@ -62,7 +62,7 @@ class ListApps(argparse.Action):
|
||||
name = "[DEAD]"
|
||||
|
||||
try:
|
||||
- cmdline = subprocess.getoutput('cat /proc/%s/cmdline' % pid)
|
||||
+ cmdline = subprocess.getoutput('@cat@ /proc/%s/cmdline' % pid)
|
||||
except:
|
||||
cmdline = '(exception encountered)'
|
||||
else:
|
||||
@@ -197,7 +197,7 @@ def inGraphicalDesktop():
|
||||
def otherOrcas():
|
||||
"""Returns the pid of any other instances of Orca owned by this user."""
|
||||
|
||||
- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
|
||||
+ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
|
||||
shell=True,
|
||||
stdout=subprocess.PIPE).stdout
|
||||
pids = openFile.read()
|
||||
Loading…
Add table
Add a link
Reference in a new issue