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
|
|
@ -0,0 +1,41 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkg-config, gtk3, m17n_lib
|
||||
, wrapGAppsHook, gobject-introspection
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
python = python3.withPackages (ps: with ps; [
|
||||
pygobject3
|
||||
dbus-python
|
||||
]);
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus-typing-booster";
|
||||
version = "2.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mike-fabian";
|
||||
repo = "ibus-typing-booster";
|
||||
rev = version;
|
||||
sha256 = "072mi8r10v78sfs81zxdwfabf87fp872c99c5iral1ywwa4iynpl";
|
||||
};
|
||||
|
||||
patches = [ ./hunspell-dirs.patch ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ];
|
||||
buildInputs = [ python ibus gtk3 m17n_lib ];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${m17n_lib}/lib")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://mike-fabian.github.io/ibus-typing-booster/";
|
||||
license = licenses.gpl3Plus;
|
||||
description = "A typing booster engine for the IBus platform";
|
||||
maintainers = with maintainers; [ ];
|
||||
isIbusEngine = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
diff --git a/engine/itb_util.py b/engine/itb_util.py
|
||||
index ded236a..633525a 100755
|
||||
--- a/engine/itb_util.py
|
||||
+++ b/engine/itb_util.py
|
||||
@@ -1876,14 +1876,18 @@ def find_hunspell_dictionary(language):
|
||||
If no dictionary can be found for the requested language,
|
||||
the return value is ('', '').
|
||||
'''
|
||||
- dirnames = [
|
||||
- '/usr/share/hunspell',
|
||||
- '/usr/share/myspell',
|
||||
- '/usr/share/myspell/dicts',
|
||||
- '/usr/local/share/hunspell', # On FreeBSD the dictionaries are here
|
||||
- '/usr/local/share/myspell',
|
||||
- '/usr/local/share/myspell/dicts',
|
||||
- ]
|
||||
+
|
||||
+ if "NIX_HUNSPELL_DIRS" in os.environ:
|
||||
+ dirnames = os.environ["NIX_HUNSPELL_DIRS"].split(":")
|
||||
+ else: # fallback to the original behavior
|
||||
+ dirnames = [
|
||||
+ '/usr/share/hunspell',
|
||||
+ '/usr/share/myspell',
|
||||
+ '/usr/share/myspell/dicts',
|
||||
+ '/usr/local/share/hunspell', # On FreeBSD the dictionaries are here
|
||||
+ '/usr/local/share/myspell',
|
||||
+ '/usr/local/share/myspell/dicts',
|
||||
+ ]
|
||||
dic_path = ''
|
||||
aff_path = ''
|
||||
for language in expand_languages([language]):
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
{ typing-booster, symlinkJoin, hunspellDicts, lib, makeWrapper
|
||||
, langs ? [ "de-de" "en-us" "es-es" "fr-moderne" "it-it" "sv-se" "sv-fi" ]
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
hunspellDirs = with lib; makeSearchPath ":" (flatten (forEach langs (lang: [
|
||||
"${hunspellDicts.${lang}}/share/hunspell"
|
||||
"${hunspellDicts.${lang}}/share/myspell"
|
||||
"${hunspellDicts.${lang}}/share/myspell/dicts"
|
||||
])));
|
||||
|
||||
in
|
||||
|
||||
symlinkJoin {
|
||||
name = "${typing-booster.name}-with-hunspell";
|
||||
paths = [ typing-booster ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postBuild = ''
|
||||
for i in bin/emoji-picker libexec/ibus-{setup,engine}-typing-booster; do
|
||||
wrapProgram "$out/$i" \
|
||||
--prefix NIX_HUNSPELL_DIRS : ${lib.escapeShellArg hunspellDirs}
|
||||
done
|
||||
|
||||
sed -i -e "s,${typing-booster},$out," $out/share/ibus/component/typing-booster.xml
|
||||
'';
|
||||
|
||||
inherit (typing-booster) meta;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue