mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-31 04:04:45 +00:00
Code Activity

skip buildEnv and create a package with /share/fonts

Browse source
This commit is contained in:
Piotr Limanowski 2018-10-06 17:55:21 +02:00
parent 2a53ac278f
commit 00cd92968e
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
modules/fonts/default.nix
View file

@ -16,16 +16,22 @@ let
hasExt = exts: name: foldl' (acc: ext: (hasSuffix ext name) || acc) false exts; hasExt = exts: name: foldl' (acc: ext: (hasSuffix ext name) || acc) false exts;
in hasExt fontExt name; in hasExt fontExt name;
fontFiles = dir: filter isFont (readDirsRec dir); fontFiles = dir: filter isFont (readDirsRec dir);
print = font: "ln -fn '${font}' '/Library/Fonts/${baseNameOf font}'"; libraryLink = font: "ln -fn '/run/current-system/sw/share/fonts/${baseNameOf font}' '/Library/Fonts/${baseNameOf font}'";
printLinks = dir: concatMapStringsSep "\n" print (fontFiles dir); outLink = font: "ln -sfn -t $out/share/fonts/ '${font}'";
fontLinks = link: dir: concatMapStringsSep "\n" link (fontFiles dir);
systemFontsDir = pkgs.runCommand "systemFontsDir" {} ''
mkdir -p "$out/share/fonts"
echo ${toString config.fonts.fonts}
${concatMapStringsSep "\n" (fontLinks outLink) config.fonts.fonts}
'';
in { in {
options = { options = {
fonts = { fonts = {
enableFontDir = mkOption { enableFontDir = mkOption {
default = false; default = false;
description = '' description = ''
Whether to enable font directory management. Whether to enable font directory management and link all fonts in <filename>/run/current-system/sw/share/fonts</filename>.
Important: enabling font directory management removes all manually-added fonts. Important: removes all manually-added fonts.
''; '';
}; };
fonts = mkOption { fonts = mkOption {
@ -38,18 +44,14 @@ in {
}; };
config = { config = {
system.build.fonts = mkIf cfg.enableFontDir (pkgs.buildEnv {
name = "system-fonts";
paths = cfg.fonts;
pathsToLink = "/share/fonts";
});
system.activationScripts.fonts.text = "" + optionalString cfg.enableFontDir '' system.activationScripts.fonts.text = "" + optionalString cfg.enableFontDir ''
# Set up fonts. # Set up fonts.
echo "resetting fonts..." >&2 echo "resetting fonts..." >&2
fontrestore default -n 2>&1 | grep -o '/Library/Fonts/.*' | tr '\n' '\0' | xargs -0 rm || true fontrestore default -n 2>&1 | grep -o '/Library/Fonts/.*' | tr '\n' '\0' | xargs -0 rm || true
echo "updating fonts..." >&2 echo "updating fonts..." >&2
${printLinks config.system.build.fonts} ${fontLinks libraryLink systemFontsDir}
''; '';
environment.systemPackages = [ systemFontsDir ];
environment.pathsToLink = [ "/share/fonts" ]; environment.pathsToLink = [ "/share/fonts" ];
}; };
} }

2
tests/fonts.nix
View file

@ -11,7 +11,7 @@ in {
test = '' test = ''
echo checking installed fonts >&2 echo checking installed fonts >&2
grep -o "fontrestore default -n" ${config.out}/activate grep -o "fontrestore default -n" ${config.out}/activate
grep -o "/share/fonts/truetype/DejaVuSans.ttf' '/Library/Fonts/DejaVuSans.ttf'" ${config.out}/activate grep -o "ln -fn '/run/current-system/sw/share/fonts/DejaVuSans.ttf' '/Library/Fonts/DejaVuSans.ttf'" ${config.out}/activate
''; '';
} }