diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-11 18:01:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-11 18:01:13 +0000 |
commit | f2d72714321af3de5bf635e76fef21ab87a25f96 (patch) | |
tree | 91c04e4c9e8eec29b02ff4bfb9d3637ba37bfb4e /pkgs/tools/inputmethods | |
parent | c5b522e35113b09577dbef8b8ed4ad3f970d823e (diff) | |
parent | ac359cc654f84b0c5299a8e485c3147eca1c1585 (diff) | |
download | nixpkgs-f2d72714321af3de5bf635e76fef21ab87a25f96.tar nixpkgs-f2d72714321af3de5bf635e76fef21ab87a25f96.tar.gz nixpkgs-f2d72714321af3de5bf635e76fef21ab87a25f96.tar.bz2 nixpkgs-f2d72714321af3de5bf635e76fef21ab87a25f96.tar.lz nixpkgs-f2d72714321af3de5bf635e76fef21ab87a25f96.tar.xz nixpkgs-f2d72714321af3de5bf635e76fef21ab87a25f96.tar.zst nixpkgs-f2d72714321af3de5bf635e76fef21ab87a25f96.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/inputmethods')
-rw-r--r-- | pkgs/tools/inputmethods/emote/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/tools/inputmethods/emote/default.nix b/pkgs/tools/inputmethods/emote/default.nix index d65831d5202..79831d7ef1e 100644 --- a/pkgs/tools/inputmethods/emote/default.nix +++ b/pkgs/tools/inputmethods/emote/default.nix @@ -2,18 +2,21 @@ python3Packages.buildPythonApplication rec { pname = "emote"; - version = "2.0.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "tom-james-watson"; repo = "Emote"; rev = "v${version}"; - sha256 = "kYXFD6VBnuEZ0ZMsF6ZmN4V0JN83puxRILpNlllVsKQ="; + sha256 = "mqCSl+EGbnL9AfzZT3aa/Y5Rsx433ZmI31BmK3wkaJk="; }; postPatch = '' - substituteInPlace setup.py --replace "pygobject==3.36.0" "pygobject" + substituteInPlace setup.py \ + --replace "pygobject==3.36.0" "pygobject" \ + --replace "manimpango==0.3.0" "manimpango" substituteInPlace emote/config.py --replace 'os.environ.get("SNAP")' "'$out/share/emote'" + substituteInPlace emote/picker.py --replace 'os.environ.get("SNAP_VERSION", "dev build")' "'$version'" substituteInPlace snap/gui/emote.desktop --replace "Icon=\''${SNAP}/usr/share/icons/emote.svg" "Icon=emote.svg" ''; @@ -27,6 +30,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = [ + python3Packages.manimpango python3Packages.pygobject3 gtk3 xdotool @@ -36,7 +40,7 @@ python3Packages.buildPythonApplication rec { postInstall = '' install -D snap/gui/emote.desktop $out/share/applications/emote.desktop install -D snap/gui/emote.svg $out/share/pixmaps/emote.svg - install -D -t $out/share/emote/static static/{emojis.json,logo.svg,style.css} + install -D -t $out/share/emote/static static/{NotoColorEmoji.ttf,emojis.csv,logo.svg,style.css} ''; dontWrapGApps = true; |