Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/by-name/ha/harfbuzz/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
icu,
graphite2,
harfbuzz, # The icu variant uses and propagates the non-icu one.
withCoreText ? false,
withCoreText ? stdenv.hostPlatform.isDarwin, # withCoreText is required for macOS
withIcu ? false, # recommended by upstream as default, but most don't needed and it's big
withGraphite2 ? true, # it is small and major distros do include it
python3,
Expand Down
6 changes: 1 addition & 5 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1551,7 +1551,6 @@ with pkgs;
cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { };

kitty = callPackage ../by-name/ki/kitty/package.nix {
harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; };
inherit (darwin) autoSignDarwinBinariesHook;
};

Expand Down Expand Up @@ -8390,9 +8389,7 @@ with pkgs;

cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { };

pango = callPackage ../development/libraries/pango {
harfbuzz = harfbuzz.override { withCoreText = stdenv.hostPlatform.isDarwin; };
};
pango = callPackage ../development/libraries/pango { };

pangomm = callPackage ../development/libraries/pangomm { };

Expand Down Expand Up @@ -8470,7 +8467,6 @@ with pkgs;
};

harfbuzzFull = harfbuzz.override {
withCoreText = stdenv.hostPlatform.isDarwin;
withGraphite2 = true;
withIcu = true;
};
Expand Down