Merge pull request #167094 from DeeUnderscore/misc/fcitx-cldr
fcitx5: use up-to-date cldr-annotations
This commit is contained in:
commit
1f117e37a2
|
@ -1,27 +0,0 @@
|
||||||
{ lib, stdenv
|
|
||||||
, fetchFromGitHub
|
|
||||||
, autoreconfHook
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "cldr-emoji-annotation";
|
|
||||||
version = "37.0_13.0_0_2";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "fujiwarat";
|
|
||||||
repo = "cldr-emoji-annotation";
|
|
||||||
rev = version;
|
|
||||||
sha256 = "0la3h6l58j9jfjvzwz65x56ijx7sppirwpqbqc06if4c2g0kzswj";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
autoreconfHook
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Emoji annotation files in CLDR";
|
|
||||||
homepage = "https://www.unicode.org/";
|
|
||||||
license = licenses.unicode-dfs-2016;
|
|
||||||
platforms = platforms.all;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -5,7 +5,7 @@
|
||||||
, cmake
|
, cmake
|
||||||
, extra-cmake-modules
|
, extra-cmake-modules
|
||||||
, cairo
|
, cairo
|
||||||
, cldr-emoji-annotation
|
, cldr-annotations
|
||||||
, pango
|
, pango
|
||||||
, fribidi
|
, fribidi
|
||||||
, fmt
|
, fmt
|
||||||
|
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
wayland
|
wayland
|
||||||
wayland-protocols
|
wayland-protocols
|
||||||
cldr-emoji-annotation
|
cldr-annotations
|
||||||
json_c
|
json_c
|
||||||
libGL
|
libGL
|
||||||
libevent
|
libevent
|
||||||
|
@ -90,6 +90,8 @@ stdenv.mkDerivation rec {
|
||||||
libxkbfile
|
libxkbfile
|
||||||
];
|
];
|
||||||
|
|
||||||
|
cmakeFlags = [ "-DCLDR_DIR=${cldr-annotations}/share/unicode/cldr" ];
|
||||||
|
|
||||||
passthru.updateScript = ./update.py;
|
passthru.updateScript = ./update.py;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -175,6 +175,7 @@ mapAliases ({
|
||||||
claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05
|
claws-mail-gtk2 = throw "claws-mail-gtk2 was removed to get rid of Python 2, please use claws-mail"; # Added 2021-12-05
|
||||||
claws-mail-gtk3 = claws-mail; # Added 2021-07-10
|
claws-mail-gtk3 = claws-mail; # Added 2021-07-10
|
||||||
clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22
|
clawsMail = throw "'clawsMail' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2022-02-22
|
||||||
|
cldr-emoji-annotation = throw "'cldr-emoji-annotation' has been removed, as it was unmaintained; use 'cldr-annotations' instead"; # Added 2022-04-03
|
||||||
clearsilver = throw "clearsilver has been removed: abandoned by upstream"; # Added 2022-03-15
|
clearsilver = throw "clearsilver has been removed: abandoned by upstream"; # Added 2022-03-15
|
||||||
clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22
|
clutter_gtk = throw "'clutter_gtk' has been renamed to/replaced by 'clutter-gtk'"; # Converted to throw 2022-02-22
|
||||||
cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05
|
cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # Added 2021-05
|
||||||
|
|
|
@ -23985,8 +23985,6 @@ with pkgs;
|
||||||
|
|
||||||
cldr-annotations = callPackage ../data/misc/cldr-annotations { };
|
cldr-annotations = callPackage ../data/misc/cldr-annotations { };
|
||||||
|
|
||||||
cldr-emoji-annotation = callPackage ../data/misc/cldr-emoji-annotation { };
|
|
||||||
|
|
||||||
clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };
|
clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };
|
||||||
|
|
||||||
cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {};
|
cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {};
|
||||||
|
|
Loading…
Reference in a new issue