Skip to content

Commit

Permalink
noto-fonts-emoji → noto-fonts-color-emoji
Browse files Browse the repository at this point in the history
Clarify that the monochrome font is not included, per NixOS#221181.

The new name is also coherent with the name of the font,
according to `fontconfig`: Noto Color Emoji.
  • Loading branch information
nbraud committed Sep 12, 2023
1 parent 49f1b36 commit c7423cd
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 16 deletions.
4 changes: 2 additions & 2 deletions doc/builders/packages/ibus.section.md
Expand Up @@ -29,12 +29,12 @@ _Note: each language passed to `langs` must be an attribute name in `pkgs.hunspe

## Built-in emoji picker {#sec-ibus-typing-booster-emoji-picker}

The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed:
The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-color-emoji` is needed:

On NixOS, it can be installed using the following expression:

```nix
{ pkgs, ... }: {
fonts.packages = with pkgs; [ noto-fonts-emoji ];
fonts.packages = with pkgs; [ noto-fonts-color-emoji ];
}
```
4 changes: 4 additions & 0 deletions nixos/doc/manual/release-notes/rl-2311.section.md
Expand Up @@ -193,6 +193,10 @@

- The `hail` NixOS module was removed, as `hail` was unmaintained since 2017.

- Package `noto-fonts-emoji` was renamed to `noto-fonts-color-emoji`;
see [#221181](https://github.com/NixOS/nixpkgs/issues/221181).


## Other Notable Changes {#sec-release-23.11-notable-changes}

- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/config/fonts/packages.nix
Expand Up @@ -37,7 +37,7 @@ in
gyre-fonts # TrueType substitutes for standard PostScript fonts
liberation_ttf
unifont
noto-fonts-emoji
noto-fonts-color-emoji
]);
};
}
2 changes: 1 addition & 1 deletion nixos/tests/fontconfig-default-fonts.nix
Expand Up @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, ... }:
nodes.machine = { config, pkgs, ... }: {
fonts.enableDefaultPackages = true; # Background fonts
fonts.packages = with pkgs; [
noto-fonts-emoji
noto-fonts-color-emoji
cantarell-fonts
twitter-color-emoji
source-code-pro
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/noto-fonts.nix
Expand Up @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
noto-fonts
noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-emoji
noto-fonts-color-emoji
];
fontconfig.defaultFonts = {
serif = [ "Noto Serif" "Noto Serif CJK SC" ];
Expand Down
Expand Up @@ -8,7 +8,7 @@
, libdeltachat
, makeDesktopItem
, makeWrapper
, noto-fonts-emoji
, noto-fonts-color-emoji
, pkg-config
, python3
, roboto
Expand Down Expand Up @@ -85,7 +85,7 @@ buildNpmPackage rec {
install -D build/icon.png \
$out/share/icons/hicolor/scalable/apps/deltachat.png
ln -sf ${noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf \
ln -sf ${noto-fonts-color-emoji}/share/fonts/noto/NotoColorEmoji.ttf \
$out/lib/node_modules/deltachat-desktop/html-dist/fonts/noto/emoji
for font in $out/lib/node_modules/deltachat-desktop/html-dist/fonts/Roboto-*.ttf; do
ln -sf ${roboto}/share/fonts/truetype/$(basename $font) \
Expand Down
4 changes: 2 additions & 2 deletions pkgs/data/fonts/noto-fonts/default.nix
Expand Up @@ -164,7 +164,7 @@ rec {
sha256 = "sha256-y1103SS0qkZMhEL5+7kQZ+OBs5tRaqkqOcs4796Fzhg=";
};

noto-fonts-emoji =
noto-fonts-color-emoji =
let
version = "2.038";
emojiPythonEnv =
Expand Down Expand Up @@ -217,7 +217,7 @@ rec {
'';

meta = with lib; {
description = "Color and Black-and-White emoji fonts";
description = "Color emoji font";
homepage = "https://github.com/googlefonts/noto-emoji";
license = with licenses; [ ofl asl20 ];
platforms = platforms.all;
Expand Down
10 changes: 5 additions & 5 deletions pkgs/data/fonts/twitter-color-emoji/default.nix
Expand Up @@ -10,7 +10,7 @@
, python3
, which
, zopfli
, noto-fonts-emoji
, noto-fonts-color-emoji
}:

let
Expand All @@ -33,15 +33,15 @@ stdenv.mkDerivation rec {
inherit version;

srcs = [
noto-fonts-emoji.src
noto-fonts-color-emoji.src
twemojiSrc
];

sourceRoot = noto-fonts-emoji.src.name;
sourceRoot = noto-fonts-color-emoji.src.name;

postUnpack = ''
chmod -R +w ${twemojiSrc.name}
mv ${twemojiSrc.name} ${noto-fonts-emoji.src.name}
mv ${twemojiSrc.name} ${noto-fonts-color-emoji.src.name}
'';

nativeBuildInputs = [
Expand All @@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
"s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#"
];
in ''
${noto-fonts-emoji.postPatch}
${noto-fonts-color-emoji.postPatch}
sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl
pushd ${twemojiSrc.name}/assets/72x72/
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Expand Up @@ -1227,6 +1227,7 @@ mapAliases ({
nomad_1_3 = throw "nomad_1_3 has been removed because it's outdated. Use a a newer version instead"; # Added 2023-09-02
nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27
noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16
noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09
noto-fonts-extra = noto-fonts; # Added 2023-04-08
nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # Added 2022-01-15
now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # Added 2021-08-05
Expand Down
5 changes: 3 additions & 2 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -29924,8 +29924,9 @@ with pkgs;
noto-fonts-lgc-plus
noto-fonts-cjk-sans
noto-fonts-cjk-serif
noto-fonts-emoji
noto-fonts-emoji-blob-bin;
noto-fonts-color-emoji
noto-fonts-emoji-blob-bin
;

nuclear = callPackage ../applications/audio/nuclear { };

Expand Down

0 comments on commit c7423cd

Please sign in to comment.