Make font handling match NixOS #665
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tf files in any directory in the passed packages
sielicki
reviewed
Jun 16, 2023
| ln -sf "$f" $out/Library/Fonts | ||
| done | ||
| font_regexp='.*\.\(ttf\|ttc\|otf\)' | ||
| find -L ${toString cfg.fonts} -regex "$font_regexp" -type f -print0 | while IFS= read -rd "" f; do |
There was a problem hiding this comment.
This prevents non-fonts from being iterated-over in the activationScripts, correct?
emilazy
approved these changes
Jul 10, 2023
|
Can you rebase this against latest |
Apologies for the delay, I just saw this comment. I've merged in the current |
|
Thanks! |
emilazy
added a commit
to emilazy/nix-darwin
that referenced
this pull request
Aug 3, 2023
Ensure that LnL7#665 works correctly.
emilazy
added a commit
to emilazy/nix-darwin
that referenced
this pull request
Jun 13, 2024
Ensure that LnL7#665 works correctly.
347Online
pushed a commit
to 347Online/nix-darwin
that referenced
this pull request
Jun 16, 2024
Ensure that LnL7#665 works correctly.
kamushadenes
pushed a commit
to kamushadenes/nix-darwin
that referenced
this pull request
Jul 8, 2024
Ensure that LnL7#665 works correctly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, nix-darwin would look in the
share/fontsdirectory in each of the packages mentioned in thefonts.fontsoption. Not all fonts packaged in nixpkgs place their fonts in this directory. It looks like this logic recently changed to just link every file in every package, whether it's a font or not. This PR changes the handling offonts.fontsto match NixOS's behavior, which is to usefindto find all .ttf, .ttc, and .otf files in any of the passed-in paths. This allows usingfonts.fontswith more font packages.