mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-04 03:53:56 +00:00
4f0dadbf38
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
89 lines
3.3 KiB
Nix
89 lines
3.3 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
{
|
|
options = {
|
|
gtk.iconCache.enable = lib.mkOption {
|
|
type = lib.types.bool;
|
|
default = config.services.xserver.enable;
|
|
defaultText = lib.literalExpression "config.services.xserver.enable";
|
|
description = ''
|
|
Whether to build icon theme caches for GTK applications.
|
|
'';
|
|
};
|
|
};
|
|
|
|
config = lib.mkIf config.gtk.iconCache.enable {
|
|
|
|
# (Re)build icon theme caches
|
|
# ---------------------------
|
|
# Each icon theme has its own cache. The difficult is that many
|
|
# packages may contribute with icons to the same theme by installing
|
|
# some icons.
|
|
#
|
|
# For instance, on my current NixOS system, the following packages
|
|
# (among many others) have icons installed into the hicolor icon
|
|
# theme: hicolor-icon-theme, psensor, wpa_gui, caja, etc.
|
|
#
|
|
# As another example, the mate icon theme has icons installed by the
|
|
# packages mate-icon-theme, mate-settings-daemon, and libmateweather.
|
|
#
|
|
# The HighContrast icon theme also has icons from different packages,
|
|
# like gnome-theme-extras and meld.
|
|
|
|
# When the cache is built all of its icons has to be known. How to
|
|
# implement this?
|
|
#
|
|
# I think that most themes have all icons installed by only one
|
|
# package. On my system there are 71 themes installed. Only 3 of them
|
|
# have icons installed from more than one package.
|
|
#
|
|
# If the main package of the theme provides a cache, presumably most
|
|
# of its icons will be available to applications without running this
|
|
# module. But additional icons offered by other packages will not be
|
|
# available. Therefore I think that it is good that the main theme
|
|
# package installs a cache (although it does not completely fixes the
|
|
# situation for packages installed with nix-env).
|
|
#
|
|
# The module solution presented here keeps the cache when there is
|
|
# only one package contributing with icons to the theme. Otherwise it
|
|
# rebuilds the cache taking into account the icons provided all
|
|
# packages.
|
|
|
|
environment.extraSetup = ''
|
|
# For each icon theme directory ...
|
|
find $out/share/icons -exec test -d {} ';' -mindepth 1 -maxdepth 1 -print0 | while read -d $'\0' themedir
|
|
do
|
|
# In order to build the cache, the theme dir should be
|
|
# writable. When the theme dir is a symbolic link to somewhere
|
|
# in the nix store it is not writable and it means that only
|
|
# one package is contributing to the theme. If it already has
|
|
# a cache, no rebuild is needed. Otherwise a cache has to be
|
|
# built, and to be able to do that we first remove the
|
|
# symbolic link and make a directory, and then make symbolic
|
|
# links from the original directory into the new one.
|
|
|
|
if [ ! -w "$themedir" -a -L "$themedir" -a ! -r "$themedir"/icon-theme.cache ]; then
|
|
name=$(basename "$themedir")
|
|
path=$(readlink -f "$themedir")
|
|
rm "$themedir"
|
|
mkdir -p "$themedir"
|
|
ln -s "$path"/* "$themedir"/
|
|
fi
|
|
|
|
# (Re)build the cache if the theme dir is writable, replacing any
|
|
# existing cache for the theme
|
|
|
|
if [ -w "$themedir" ]; then
|
|
rm -f "$themedir"/icon-theme.cache
|
|
${pkgs.buildPackages.gtk3.out}/bin/gtk-update-icon-cache --ignore-theme-index "$themedir"
|
|
fi
|
|
done
|
|
'';
|
|
};
|
|
|
|
}
|