summary refs log tree commit diff
path: root/pkgs/tools/inputmethods
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-11-11 18:01:50 +0000
committerGitHub <noreply@github.com>2021-11-11 18:01:50 +0000
commita4e03b897765f3b4e0c2182d323a2690ce8b28a0 (patch)
tree27f3acedbffe1140a75901e64ea4b4eb23083620 /pkgs/tools/inputmethods
parentbb4cba1777733b5bdae896330bccf1ff0886bfc3 (diff)
parentf2d72714321af3de5bf635e76fef21ab87a25f96 (diff)
downloadnixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar
nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar.gz
nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar.bz2
nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar.lz
nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar.xz
nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.tar.zst
nixpkgs-a4e03b897765f3b4e0c2182d323a2690ce8b28a0.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/inputmethods')
-rw-r--r--pkgs/tools/inputmethods/emote/default.nix12
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;