diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-09-05 00:19:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-05 00:19:38 +0200 |
| commit | 4f0f26771e80ec85e1f0b1a19ee86870e98730d8 (patch) | |
| tree | bd6c125cb40007d82cbd10a1bb5757c26a98372a /nixos/modules/config | |
| parent | 3157bf1db7c24d9592feb47cbc1ef585af69c3bd (diff) | |
| parent | 6f9606380419fe1b4e1c91b48982ed58040eacdd (diff) | |
| download | nixpkgs-4f0f26771e80ec85e1f0b1a19ee86870e98730d8.tar nixpkgs-4f0f26771e80ec85e1f0b1a19ee86870e98730d8.tar.gz nixpkgs-4f0f26771e80ec85e1f0b1a19ee86870e98730d8.tar.bz2 nixpkgs-4f0f26771e80ec85e1f0b1a19ee86870e98730d8.tar.lz nixpkgs-4f0f26771e80ec85e1f0b1a19ee86870e98730d8.tar.xz nixpkgs-4f0f26771e80ec85e1f0b1a19ee86870e98730d8.tar.zst nixpkgs-4f0f26771e80ec85e1f0b1a19ee86870e98730d8.zip | |
Merge pull request #95358 from jtojnar/global-fontconfig
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/fonts/fontconfig.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index ae7db74d011..1de1916a07d 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -1,6 +1,6 @@ /* -Configuration files are linked to /etc/fonts/${pkgs.fontconfig.configVersion}/conf.d/ +Configuration files are linked to /etc/fonts/conf.d/ This module generates a package containing configuration files and link it in /etc/fonts. @@ -176,15 +176,16 @@ let confPkg = pkgs.runCommand "fontconfig-conf" { preferLocalBuild = true; } '' - dst=$out/etc/fonts/${pkg.configVersion}/conf.d + dst=$out/etc/fonts/conf.d mkdir -p $dst # fonts.conf ln -s ${pkg.out}/etc/fonts/fonts.conf \ $dst/../fonts.conf # TODO: remove this legacy symlink once people stop using packages built before #95358 was merged - ln -s /etc/fonts/${pkg.configVersion}/fonts.conf \ - $out/etc/fonts/fonts.conf + mkdir -p $out/etc/fonts/2.11 + ln -s /etc/fonts/fonts.conf \ + $out/etc/fonts/2.11/fonts.conf # fontconfig default config files ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \ |