Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 12834b3e8735
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 09558f1dbf38
Choose a head ref
  • 6 commits
  • 5 files changed
  • 2 contributors

Commits on Jul 11, 2020

  1. fontconfig: 2.12.6 -> 2.13.92

    worldofpeace authored and jtojnar committed Jul 11, 2020
    Copy the full SHA
    27b14ee View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    87786bc View commit details
    Browse the repository at this point in the history
  3. fontconfig: Only read versioned config dirs

    Falling back to unversioned `/etc/fonts/conf.d` when versioned one does not exist
    is problematic since it only occurs on non-NixOS systems and those are likely
    to have a different version of fontconfig. When those versions use incompatible
    elements in the config, apps using fontconfig will crash.
    
    Instead, we are now falling back to the in-package `fonts.conf` file that loads
    both the versioned global `conf.d` directory and the in-package `conf.d` since using
    upstream settings on non-NixOS is preferable to not being able to use apps there.
    
    In fact, we would not even need to link `fonts.conf`, as the in-package `fonts.conf`
    will be always used unless someone creates the global one manually (the option is still
    retained if one wants to write a custom NixOS module and to avoid unnecessary stat call on NixOS).
    
    Additionally, since the `fonts.conf` will always load `conf.d` from the package, we no longer
    need to install them to sytem `/etc` in the module. This needed some mucking with `50-user.conf`
    which disables configs in user directories (a good thing IMO, NixOS module will turn it back on)
    but otherwise, it is cleaner. The files are still prioritized by their name, regardless of their location.
    
    See #73795 (comment) for more information.
    jtojnar committed Jul 11, 2020
    Copy the full SHA
    edf2541 View commit details
    Browse the repository at this point in the history
  4. fontconfig: Load fonts also from FHS paths

    With previous patch, we no longer load non-versioned fonts.conf file to avoid incompatibilities
    but this also means fontconfig will not load system-wide installed fonts on non-NixOS systems.
    
    As a compromise, let's hardcode the FHS font paths to the built-in config so that the system
    fonts work there. Unlike with the system config we do not need to worry about compatibility as
    incompatible font files will be simply ignored.
    
    Of course there will still be disparity if the system install fonts to some other location than
    these two but I am afraid this is the best we can do.
    
    See #73795 (comment) for discussion.
    jtojnar committed Jul 11, 2020
    Copy the full SHA
    993deed View commit details
    Browse the repository at this point in the history
  5. fontconfig: remove its rules from configs

    ITS rules are used for extracting translatable strings and they have
    been moved to external files in 2.13.92 so they are not needed in
    the config files themselves.
    
    Removing them also cuts down on errors/warnings produced when using
    older versions of fontconfig (< 2.12.92). Now it will only complain
    about the description element but that is fortunately just a warning,
    not errors like the ones caused by the its attributes.
    
    Thanks to this, we can change the config version in NixOS module
    back to 2.11 allowing us to re-use the 2.13/2.14 configs for apps
    built against 2.12 fontconfig.
    jtojnar committed Jul 11, 2020
    Copy the full SHA
    6f83450 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. Copy the full SHA
    09558f1 View commit details
    Browse the repository at this point in the history