diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-29 22:28:50 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-29 22:28:50 +0200 |
| commit | 4f73633f26e80fb8b06f68793973c6e5089c790c (patch) | |
| tree | c24bbef340daf311ac73ff5352f61347fbe95135 /pkgs/development/libraries/fontconfig | |
| parent | 3f80ecfc79e748ed29368342001592e2693a3138 (diff) | |
| download | nixpkgs-4f73633f26e80fb8b06f68793973c6e5089c790c.tar nixpkgs-4f73633f26e80fb8b06f68793973c6e5089c790c.tar.gz nixpkgs-4f73633f26e80fb8b06f68793973c6e5089c790c.tar.bz2 nixpkgs-4f73633f26e80fb8b06f68793973c6e5089c790c.tar.lz nixpkgs-4f73633f26e80fb8b06f68793973c6e5089c790c.tar.xz nixpkgs-4f73633f26e80fb8b06f68793973c6e5089c790c.tar.zst nixpkgs-4f73633f26e80fb8b06f68793973c6e5089c790c.zip | |
treewide: stop using fontbhttf
Diffstat (limited to 'pkgs/development/libraries/fontconfig')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/fontconfig/make-fonts-cache.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/fontconfig/make-fonts-conf.nix | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 74048afe731..cf003344e52 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, fontbhttf +{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts , substituteAll }: /** Font configuration scheme @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/ "--disable-docs" - # just ~1MB; this is what you get when loading config fails for some reason - "--with-default-fonts=${fontbhttf}" + # just <1MB; this is what you get when loading config fails for some reason + "--with-default-fonts=${dejavu_fonts.minimal}" ]; # We should find a better way to access the arch reliably. @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { postInstall = '' cd "$out/etc/fonts" - "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ + "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${dejavu_fonts.minimal}" \ --stringparam fontconfigConfigVersion "${configVersion}" \ --path $out/share/xml/fontconfig \ ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \ diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index b996cd228c7..53c2a335cc0 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -1,4 +1,4 @@ -{ runCommand, lib, writeText, fontconfig, fontbhttf, fontDirectories }: +{ runCommand, lib, writeText, fontconfig, fontDirectories }: runCommand "fc-cache" rec { diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix index 2d0a21ea9dd..3cd4a894b37 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix @@ -1,10 +1,10 @@ -{ runCommand, libxslt, fontconfig, fontbhttf, fontDirectories }: +{ runCommand, libxslt, fontconfig, dejavu_fonts, fontDirectories }: runCommand "fonts.conf" { buildInputs = [ libxslt fontconfig ]; - # Add a default font for non-nixos systems. fontbhttf is only about 1mb. - fontDirectories = fontDirectories ++ [ fontbhttf ]; + # Add a default font for non-nixos systems, <1MB and in nixos defaults. + fontDirectories = fontDirectories ++ [ dejavu_fonts.minimal ]; } '' xsltproc --stringparam fontDirectories "$fontDirectories" \ |