diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-29 22:41:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-29 22:41:10 +0200 |
| commit | e6f1028340d7ab1c485efccbbbbaec4b9cb5712a (patch) | |
| tree | 62816b99e5545538d011179b1b59932b4b2b0aae /pkgs/top-level | |
| parent | 3bfb354145e91aeb681697a954a858e9dce4ecd9 (diff) | |
| parent | 40dc278ee0d6f5e6d3928a78569a98355c079ada (diff) | |
| download | nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar.gz nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar.bz2 nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar.lz nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar.xz nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.tar.zst nixlib-e6f1028340d7ab1c485efccbbbbaec4b9cb5712a.zip | |
Merge: solve unfree xorg.fontbhttf
Fixes #17571.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 302069fd5214..ca4ab18864e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6537,7 +6537,7 @@ in licenseAccepted = (config.neoload.accept_license or false); fontsConf = makeFontsConf { fontDirectories = [ - xorg.fontbhttf + dejavu_fonts.minimal ]; }; }; @@ -13726,7 +13726,7 @@ in bluez5 = bluez5_28; fontsConf = makeFontsConf { fontDirectories = [ - freefont_ttf xorg.fontmiscmisc xorg.fontbhttf + freefont_ttf xorg.fontmiscmisc ]; }; clucene_core = clucene_core_2; @@ -13745,7 +13745,7 @@ in bluez5 = bluez5_28; fontsConf = makeFontsConf { fontDirectories = [ - freefont_ttf xorg.fontmiscmisc xorg.fontbhttf + freefont_ttf xorg.fontmiscmisc ]; }; mdds = mdds_0_12_1; |