commit 0927405a371292e9abddb2365540e46e2f1cc2c7 · pyrox.dev/nixpkgs

+25 -2

nixos/modules/config/fonts/fontconfig.nix

···

       27
        
       

     

       28
        
         config = mkIf config.fonts.enableFontConfig {

     

       29
        
       

     

       30
       -
           # Bring in the default (upstream) fontconfig configuration.

     

       0
        
       
     

       0
        
       
     

       31
        
           environment.etc."fonts/fonts.conf".source =

     

       32
       -
             pkgs.makeFontsConf { fontDirectories = config.fonts.fonts; };

     

       33
        
       

     

       34
        
           environment.etc."fonts/conf.d/00-nixos.conf".text =

     

       35
        
             ''

     
···

       43
        
                     <const>hintslight</const>

     

       44
        
                   </edit>

     

       45
        
                 </match>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       46
        
       

     

       47
        
               </fontconfig>

     

       48
        
             '';

···

       27
        
       

     

       28
        
         config = mkIf config.fonts.enableFontConfig {

     

       29
        
       

     

       30
       +
           # Fontconfig 2.10 backward compatibility

     

       31
       +
       

     

       32
       +
           # Bring in the default (upstream) fontconfig configuration, only for fontconfig 2.10

     

       33
        
           environment.etc."fonts/fonts.conf".source =

     

       34
       +
             pkgs.makeFontsConf { fontconfig = pkgs.fontconfig_210; fontDirectories = config.fonts.fonts; };

     

       35
        
       

     

       36
        
           environment.etc."fonts/conf.d/00-nixos.conf".text =

     

       37
        
             ''

     
···

       45
        
                     <const>hintslight</const>

     

       46
        
                   </edit>

     

       47
        
                 </match>

     

       48
       +
       

     

       49
       +
               </fontconfig>

     

       50
       +
             '';

     

       51
       +
       

     

       52
       +
           # Versioned fontconfig > 2.10. Only specify font directories.

     

       53
       +
       

     

       54
       +
           environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/00-nixos.conf".text =

     

       55
       +
             ''

     

       56
       +
               <?xml version='1.0'?>

     

       57
       +
               <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>

     

       58
       +
               <fontconfig>

     

       59
       +
       

     

       60
       +
                 <!-- Set the default hinting style to "slight". -->

     

       61
       +
                 <match target="font">

     

       62
       +
                   <edit mode="assign" name="hintstyle">

     

       63
       +
                     <const>hintslight</const>

     

       64
       +
                   </edit>

     

       65
       +
                 </match>

     

       66
       +
       

     

       67
       +
                 <!-- Font directories -->

     

       68
       +
                 ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)}

     

       69
        
       

     

       70
        
               </fontconfig>

     

       71
        
             '';

-8

nixos/modules/config/fonts/fonts.nix

···

       13
        
               type = types.listOf types.path;

     

       14
        
               example = literalExample "[ pkgs.dejavu_fonts ]";

     

       15
        
               description = "List of primary font paths.";

     

       16
       -
               apply = list: list ++

     

       17
       -
                 [ # - the user's current profile

     

       18
       -
                   "~/.nix-profile/lib/X11/fonts"

     

       19
       -
                   "~/.nix-profile/share/fonts"

     

       20
       -
                   # - the default profile

     

       21
       -
                   "/nix/var/nix/profiles/default/lib/X11/fonts"

     

       22
       -
                   "/nix/var/nix/profiles/default/share/fonts"

     

       23
       -
                 ];

     

       24
        
             };

     

       25
        
       

     

       26
        
           };

···

       13
        
               type = types.listOf types.path;

     

       14
        
               example = literalExample "[ pkgs.dejavu_fonts ]";

     

       15
        
               description = "List of primary font paths.";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
             };

     

       17
        
       

     

       18
        
           };

+61

pkgs/development/libraries/fontconfig/2.10.nix

···

       1
       +
       { stdenv, fetchurl, pkgconfig, freetype, expat }:

     

       2
       +
       

     

       3
       +
       stdenv.mkDerivation rec {

     

       4
       +
         name = "fontconfig-2.10.2";

     

       5
       +
       

     

       6
       +
         src = fetchurl {

     

       7
       +
           url = "http://fontconfig.org/release/${name}.tar.bz2";

     

       8
       +
           sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f";

     

       9
       +
         };

     

       10
       +
       

     

       11
       +
         infinality_patch =

     

       12
       +
           let subvers = "1";

     

       13
       +
             in fetchurl {

     

       14
       +
               url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2;

     

       15
       +
               sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7";

     

       16
       +
             }

     

       17
       +
           ;

     

       18
       +
       

     

       19
       +
         propagatedBuildInputs = [ freetype ];

     

       20
       +
         buildInputs = [ pkgconfig expat ];

     

       21
       +
       

     

       22
       +
         configureFlags = [

     

       23
       +
           "--sysconfdir=/etc"

     

       24
       +
           "--with-cache-dir=/var/cache/fontconfig"

     

       25
       +
           "--disable-docs"

     

       26
       +
           "--with-default-fonts="

     

       27
       +
         ];

     

       28
       +
       

     

       29
       +
         # We should find a better way to access the arch reliably.

     

       30
       +
         crossArch = stdenv.cross.arch or null;

     

       31
       +
       

     

       32
       +
         preConfigure = ''

     

       33
       +
           if test -n "$crossConfig"; then

     

       34
       +
             configureFlags="$configureFlags --with-arch=$crossArch";

     

       35
       +
           fi

     

       36
       +
         '';

     

       37
       +
       

     

       38
       +
         enableParallelBuilding = true;

     

       39
       +
       

     

       40
       +
         doCheck = true;

     

       41
       +
       

     

       42
       +
         # Don't try to write to /var/cache/fontconfig at install time.

     

       43
       +
         installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";

     

       44
       +
       

     

       45
       +
         postInstall = ''

     

       46
       +
           cd "$out/etc/fonts" && tar xvf ${infinality_patch}

     

       47
       +
         '';

     

       48
       +
       

     

       49
       +
         passthru = {

     

       50
       +
           # Empty for backward compatibility, there was no versioning before 2.11

     

       51
       +
           configVersion = "";

     

       52
       +
         };

     

       53
       +
       

     

       54
       +
         meta = with stdenv.lib; {

     

       55
       +
           description = "A library for font customization and configuration";

     

       56
       +
           homepage = http://fontconfig.org/;

     

       57
       +
           license = licenses.bsd2; # custom but very bsd-like

     

       58
       +
           platforms = platforms.all;

     

       59
       +
           maintainers = [ maintainers.vcunat ];

     

       60
       +
         };

     

       61
       +
       }

-5

pkgs/development/libraries/fontconfig/builder.sh

···

       1
       -
       source $stdenv/setup

     

       2
       -
       

     

       3
       -
       configureFlags="--with-confdir=$out/etc/fonts --disable-docs"

     

       4
       -
       

     

       5
       -
       genericBuild

+21 -7

pkgs/development/libraries/fontconfig/default.nix

···

       1
       -
       { stdenv, fetchurl, pkgconfig, freetype, expat }:

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       stdenv.mkDerivation rec {

     

       4
       -
         name = "fontconfig-2.10.2";

     

       5
        
       

     

       6
        
         src = fetchurl {

     

       7
        
           url = "http://fontconfig.org/release/${name}.tar.bz2";

     

       8
       -
           sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f";

     

       9
        
         };

     

       10
        
       

     

       11
        
         infinality_patch =

     
···

       17
        
           ;

     

       18
        
       

     

       19
        
         propagatedBuildInputs = [ freetype ];

     

       20
       -
         buildInputs = [ pkgconfig expat ];

     

       21
        
       

     

       22
        
         configureFlags = [

     

       23
       -
           "--sysconfdir=/etc"

     

       24
        
           "--with-cache-dir=/var/cache/fontconfig"

     

       25
        
           "--disable-docs"

     

       26
       -
           "--with-default-fonts="

     

       27
        
         ];

     

       28
        
       

     

       29
        
         # We should find a better way to access the arch reliably.

     
···

       40
        
         doCheck = true;

     

       41
        
       

     

       42
        
         # Don't try to write to /var/cache/fontconfig at install time.

     

       43
       -
         installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";

     

       44
        
       

     

       0
        
       
     

       45
        
         postInstall = ''

     

       46
        
           cd "$out/etc/fonts" && tar xvf ${infinality_patch}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       47
        
         '';

     

       48
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       49
        
         meta = with stdenv.lib; {

     

       50
        
           description = "A library for font customization and configuration";

     

       51
        
           homepage = http://fontconfig.org/;

···

       1
       +
       { stdenv, fetchurl, pkgconfig, freetype, expat, libxslt, fontbhttf }:

     

       2
        
       

     

       3
       +
       let

     

       4
       +
         configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations

     

       5
       +
       in

     

       6
        
       stdenv.mkDerivation rec {

     

       7
       +
         name = "fontconfig-2.11.1";

     

       8
        
       

     

       9
        
         src = fetchurl {

     

       10
        
           url = "http://fontconfig.org/release/${name}.tar.bz2";

     

       11
       +
           sha256 = "16baa4g5lswkyjlyf1h5lwc0zjap7c4d8grw79349a5w6dsl8qnw";

     

       12
        
         };

     

       13
        
       

     

       14
        
         infinality_patch =

     
···

       20
        
           ;

     

       21
        
       

     

       22
        
         propagatedBuildInputs = [ freetype ];

     

       23
       +
         buildInputs = [ pkgconfig libxslt expat ];

     

       24
        
       

     

       25
        
         configureFlags = [

     

       0
        
       
     

       26
        
           "--with-cache-dir=/var/cache/fontconfig"

     

       27
        
           "--disable-docs"

     

       28
       +
           "--with-default-fonts=${fontbhttf}"

     

       29
        
         ];

     

       30
        
       

     

       31
        
         # We should find a better way to access the arch reliably.

     
···

       42
        
         doCheck = true;

     

       43
        
       

     

       44
        
         # Don't try to write to /var/cache/fontconfig at install time.

     

       45
       +
         installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";

     

       46
        
       

     

       47
       +
         # Add a default font for non-nixos systems. fontbhttf is only about 1mb.

     

       48
        
         postInstall = ''

     

       49
        
           cd "$out/etc/fonts" && tar xvf ${infinality_patch}

     

       50
       +
           xsltproc --stringparam fontDirectories "${fontbhttf}" \

     

       51
       +
             --stringparam fontconfig "$out" \

     

       52
       +
             --stringparam fontconfigConfigVersion "${configVersion}" \

     

       53
       +
             --path $out/share/xml/fontconfig \

     

       54
       +
             ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \

     

       55
       +
             > fonts.conf.tmp

     

       56
       +
           mv fonts.conf.tmp $out/etc/fonts/fonts.conf

     

       57
        
         '';

     

       58
        
       

     

       59
       +
         passthru = {

     

       60
       +
           inherit configVersion;

     

       61
       +
         };

     

       62
       +
         

     

       63
        
         meta = with stdenv.lib; {

     

       64
        
           description = "A library for font customization and configuration";

     

       65
        
           homepage = http://fontconfig.org/;

+4 -2

pkgs/development/libraries/fontconfig/make-fonts-conf.nix

···

       1
       -
       { runCommand, libxslt, fontconfig, fontDirectories }:

     

       2
        
       

     

       3
        
       runCommand "fonts.conf"

     

       4
        
         {

     

       5
        
           buildInputs = [ libxslt fontconfig ];

     

       6
       -
           inherit fontDirectories;

     

       0
        
       
     

       7
        
         }

     

       8
        
         ''

     

       9
        
           xsltproc --stringparam fontDirectories "$fontDirectories" \

     

       10
        
             --stringparam fontconfig "${fontconfig}" \

     

       0
        
       
     

       11
        
             --path ${fontconfig}/share/xml/fontconfig \

     

       12
        
             ${./make-fonts-conf.xsl} ${fontconfig}/etc/fonts/fonts.conf \

     

       13
        
             > $out

···

       1
       +
       { runCommand, libxslt, fontconfig, fontbhttf, fontDirectories }:

     

       2
        
       

     

       3
        
       runCommand "fonts.conf"

     

       4
        
         {

     

       5
        
           buildInputs = [ libxslt fontconfig ];

     

       6
       +
           # Add a default font for non-nixos systems. fontbhttf is only about 1mb.

     

       7
       +
           fontDirectories = fontDirectories ++ [ fontbhttf ];

     

       8
        
         }

     

       9
        
         ''

     

       10
        
           xsltproc --stringparam fontDirectories "$fontDirectories" \

     

       11
        
             --stringparam fontconfig "${fontconfig}" \

     

       12
       +
             --stringparam fontconfigConfigVersion "${fontconfig.configVersion}" \

     

       13
        
             --path ${fontconfig}/share/xml/fontconfig \

     

       14
        
             ${./make-fonts-conf.xsl} ${fontconfig}/etc/fonts/fonts.conf \

     

       15
        
             > $out

+17 -5

pkgs/development/libraries/fontconfig/make-fonts-conf.xsl

···

       16
        
       

     

       17
        
         <xsl:param name="fontDirectories" />

     

       18
        
         <xsl:param name="fontconfig" />

     

       0
        
       
     

       19
        
       

     

       20
        
         <xsl:template match="/fontconfig">

     

       21
        
       

     

       22
        
           <fontconfig>

     

       23
        
             <xsl:apply-templates select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />

     

       24
        
       

     

       25
       -
             <include ignore_missing="yes">/etc/fonts/conf.d</include>

     

       26
        
             <include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       27
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
             <cachedir>/var/cache/fontconfig</cachedir>

     

       29
       -
             <cachedir>~/.fontconfig</cachedir>

     

       30
        
       

     

       0
        
       
     

       31
        
             <xsl:for-each select="str:tokenize($fontDirectories)">

     

       32
        
               <dir><xsl:value-of select="." /></dir>

     

       33
        
               <xsl:text>&#0010;</xsl:text>

     

       34
        
             </xsl:for-each>

     

       35
       -
             <dir prefix="xdg">fonts</dir>

     

       36
       -
             <!-- the following element will be removed in the future -->

     

       37
       -
             <dir>~/.fonts</dir>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       38
        
       

     

       39
        
           </fontconfig>

     

       40

···

       16
        
       

     

       17
        
         <xsl:param name="fontDirectories" />

     

       18
        
         <xsl:param name="fontconfig" />

     

       19
       +
         <xsl:param name="fontconfigConfigVersion" />

     

       20
        
       

     

       21
        
         <xsl:template match="/fontconfig">

     

       22
        
       

     

       23
        
           <fontconfig>

     

       24
        
             <xsl:apply-templates select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />

     

       25
        
       

     

       26
       +
             <!-- fontconfig distribution conf.d -->

     

       27
        
             <include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>

     

       28
       +
             <!-- versioned system-wide config -->

     

       29
       +
             <include ignore_missing="yes">/etc/fonts/<xsl:value-of select="$fontconfigConfigVersion" />/conf.d</include>

     

       30
       +
             <!-- look into user config -->

     

       31
       +
             <include prefix="xdg" ignore_missing="yes">fontconfig/conf.d</include>

     

       32
        
       

     

       33
       +
             <!-- the first cachedir will be used to store the cache -->

     

       34
       +
             <cachedir prefix="xdg">fontconfig</cachedir>

     

       35
       +
             <!-- /var/cache/fontconfig is useful for non-nixos systems -->

     

       36
        
             <cachedir>/var/cache/fontconfig</cachedir>

     

       0
        
       
     

       37
        
       

     

       38
       +
             <dir prefix="xdg">fonts</dir>

     

       39
        
             <xsl:for-each select="str:tokenize($fontDirectories)">

     

       40
        
               <dir><xsl:value-of select="." /></dir>

     

       41
        
               <xsl:text>&#0010;</xsl:text>

     

       42
        
             </xsl:for-each>

     

       43
       +
       

     

       44
       +
             <!-- nix user profile -->

     

       45
       +
             <dir>~/.nix-profile/lib/X11/fonts</dir>

     

       46
       +
             <dir>~/.nix-profile/share/fonts</dir>

     

       47
       +
             <!-- nix default profile -->

     

       48
       +
             <dir>/nix/var/nix/profiles/default/lib/X11/fonts</dir>

     

       49
       +
             <dir>/nix/var/nix/profiles/default/share/fonts</dir>

     

       50
        
       

     

       51
        
           </fontconfig>

     

       52

pkgs/top-level/all-packages.nix

···

       4944
        
       

     

       4945
        
         cfitsio = callPackage ../development/libraries/cfitsio { };

     

       4946
        
       

     

       0
        
       
     

       0
        
       
     

       4947
        
         fontconfig = callPackage ../development/libraries/fontconfig { };

     

       4948
        
       

     

       4949
        
         makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:

     

       4950
        
           import ../development/libraries/fontconfig/make-fonts-conf.nix {

     

       4951
        
             inherit runCommand libxslt fontconfig fontDirectories;

     

       0
        
       
     

       4952
        
           };

     

       4953
        
       

     

       4954
        
         freealut = callPackage ../development/libraries/freealut { };

···

       4944
        
       

     

       4945
        
         cfitsio = callPackage ../development/libraries/cfitsio { };

     

       4946
        
       

     

       4947
       +
         fontconfig_210 = callPackage ../development/libraries/fontconfig/2.10.nix { };

     

       4948
       +
       

     

       4949
        
         fontconfig = callPackage ../development/libraries/fontconfig { };

     

       4950
        
       

     

       4951
        
         makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:

     

       4952
        
           import ../development/libraries/fontconfig/make-fonts-conf.nix {

     

       4953
        
             inherit runCommand libxslt fontconfig fontDirectories;

     

       4954
       +
             inherit (xorg) fontbhttf;

     

       4955
        
           };

     

       4956
        
       

     

       4957
        
         freealut = callPackage ../development/libraries/freealut { };