From 58b281c3fbd9d7aaef645bc3349f8982696a21f8 Mon Sep 17 00:00:00 2001 From: John Ramsden Date: Sun, 16 Jul 2017 22:30:09 -0700 Subject: [PATCH] onboard: init at 1.4.1 Add testing reqs, but keep tests disabled Tests are runnable but still produce errors. To get tests working, add locale setting, replace killall and add nose package. To run the tests enable 'doCheck'. Hunspell needs to be explicitly installed to use. Patch SpellCheck.py to put hunspell in system datadir location. For example, '/var/run/current-system/sw/share/hunspell/' or '${HOME}/.nix-profile/share/hunspell/' To get rid of atspi errors set 'services.gnome3.at-spi2-core.enable = true' --- pkgs/applications/misc/onboard/default.nix | 156 ++++++++++++++++++ .../onboard/hunspell-use-xdg-datadirs.patch | 20 +++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 178 insertions(+) create mode 100644 pkgs/applications/misc/onboard/default.nix create mode 100644 pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix new file mode 100644 index 000000000000..a78b98a58cb3 --- /dev/null +++ b/pkgs/applications/misc/onboard/default.nix @@ -0,0 +1,156 @@ +{ fetchurl +, stdenv +, aspellWithDicts +, at_spi2_core ? null +, atspiSupport ? true +, bash +, glib +, glibcLocales +, gnome3 +, gobjectIntrospection +, gsettings_desktop_schemas +, gtk3 +, hunspell +, hunspellDicts +, hunspellWithDicts +, intltool +, isocodes +, libcanberra_gtk3 +, libudev +, libxkbcommon +, pkgconfig +, procps +, python3 +, wrapGAppsHook +, xorg +, yelp +}: + +let + customHunspell = hunspellWithDicts [hunspellDicts.en-us]; + majorVersion = "1.4"; + version = "${majorVersion}.1"; +in python3.pkgs.buildPythonApplication rec { + name = "onboard-${version}"; + src = fetchurl { + url = "https://launchpad.net/onboard/${majorVersion}/${version}/+download/${name}.tar.gz"; + sha256 = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865"; + }; + + patches = [ + # Allow loading hunspell dictionaries installed in NixOS system path + ./hunspell-use-xdg-datadirs.patch + ]; + + # For tests + LC_ALL = "en_US.UTF-8"; + doCheck = false; + checkInputs = [ + # for Onboard.SpellChecker.aspell_cmd doctests + (aspellWithDicts (dicts: with dicts; [ en ])) + + # for Onboard.SpellChecker.hunspell_cmd doctests + customHunspell + + # for Onboard.SpellChecker.hunspell doctests + hunspellDicts.en-us + hunspellDicts.es-es + hunspellDicts.it-it + + python3.pkgs.nose + ]; + + propagatedBuildInputs = [ + glib + python3 + python3.pkgs.dbus-python + python3.pkgs.distutils_extra + python3.pkgs.pyatspi + python3.pkgs.pycairo + python3.pkgs.pygobject3 + python3.pkgs.systemd + ]; + + buildInputs = [ + bash + gnome3.dconf + gsettings_desktop_schemas + gtk3 + hunspell + isocodes + libcanberra_gtk3 + libudev + libxkbcommon + wrapGAppsHook + xorg.libXtst + xorg.libxkbfile + ] ++ stdenv.lib.optional atspiSupport at_spi2_core; + + nativeBuildInputs = [ + glibcLocales + intltool + pkgconfig + ]; + + propagatedUserEnvPkgs = [ + gnome3.dconf + ]; + + preBuild = '' + # Unnecessary file, has been removed upstream + # https://github.com/NixOS/nixpkgs/pull/24986#issuecomment-296114062 + rm -r Onboard/pypredict/attic + + substituteInPlace ./scripts/sokSettings.py \ + --replace "#!/usr/bin/python3" "" \ + --replace "PYTHON_EXECUTABLE," "\"$out/bin/onboard-settings\"" \ + --replace '"-cfrom Onboard.settings import Settings\ns = Settings(False)"' "" + + chmod -x ./scripts/sokSettings.py + + patchShebangs . + + substituteInPlace ./Onboard/LanguageSupport.py \ + --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \ + --replace "/usr/bin/yelp" "${yelp}/bin/yelp" + + substituteInPlace ./Onboard/Indicator.py \ + --replace "/usr/bin/yelp" "${yelp}/bin/yelp" + + substituteInPlace ./gnome/Onboard_Indicator@onboard.org/extension.js \ + --replace "/usr/bin/yelp" "${yelp}/bin/yelp" + + substituteInPlace ./Onboard/SpellChecker.py \ + --replace "/usr/lib" "$out/lib" + + substituteInPlace ./data/org.onboard.Onboard.service \ + --replace "/usr/bin" "$out/bin" + + substituteInPlace ./Onboard/utils.py \ + --replace "/usr/share" "$out/share" + substituteInPlace ./onboard-defaults.conf.example \ + --replace "/usr/share" "$out/share" + substituteInPlace ./Onboard/Config.py \ + --replace "/usr/share/onboard" "$out/share/onboard" + + substituteInPlace ./Onboard/WordSuggestions.py \ + --replace "/usr/bin" "$out/bin" + + # killall is dangerous on non-gnu platforms. Use pkill instead. + substituteInPlace ./setup.py \ + --replace '"killall",' '"${procps}/bin/pkill", "-x",' + ''; + + postInstall = '' + cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override + + glib-compile-schemas $out/share/glib-2.0/schemas/ + ''; + + meta = { + homepage = https://launchpad.net/onboard; + description = "An onscreen keyboard useful for tablet PC users and for mobility impaired users."; + maintainers = with stdenv.lib.maintainers; [ johnramsden ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch b/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch new file mode 100644 index 000000000000..2463c8d5f5ac --- /dev/null +++ b/pkgs/applications/misc/onboard/hunspell-use-xdg-datadirs.patch @@ -0,0 +1,20 @@ +diff --git a/Onboard/SpellChecker.py b/Onboard/SpellChecker.py +index 6a92757..46e755e 100644 +--- a/Onboard/SpellChecker.py ++++ b/Onboard/SpellChecker.py +@@ -506,6 +506,10 @@ class hunspell(SCBackend): + if dicpath: + paths.extend(dicpath.split(pathsep)) + ++ datadirs = os.getenv("XDG_DATA_DIRS") ++ if datadirs: ++ paths.extend(map(lambda datadir: os.path.join(datadir, 'hunspell'), datadirs.split(pathsep))) ++ + paths.extend(LIBDIRS) + + home = os.getenv("HOME") +@@ -723,4 +727,3 @@ class aspell_cmd(SCBackend): + _logger.error(_format("Failed to execute '{}', {}", \ + " ".join(args), e)) + return [id for id in dict_ids if id] +- diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 298b79b07b8b..cbd682e95c77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1186,6 +1186,8 @@ with pkgs; nfdump = callPackage ../tools/networking/nfdump { }; + onboard = callPackage ../applications/misc/onboard { }; + patdiff = callPackage ../tools/misc/patdiff { }; playerctl = callPackage ../tools/audio/playerctl { };