commit c0e2aceef46033e43ab8b4f6aa0b36b25ba35f3d · pyrox.dev/nixpkgs

+4 -2

nixos/modules/config/fonts/fontconfig.nix

···

       49
       49
        
               </fontconfig>

     

       50
       50
        
             '';

     

       51
       51
        
       

     

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

     

       53
       53
       -
       

     

       52
       52
       +
           # Versioned fontconfig > 2.10. Take shared fonts.conf from fontconfig.

     

       53
       53
       +
           # Otherwise specify only font directories.

     

       54
       54
       +
           environment.etc."fonts/${pkgs.fontconfig.configVersion}/fonts.conf".source =

     

       55
       55
       +
             "${pkgs.fontconfig}/etc/fonts/fonts.conf";

     

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

     

       55
       57
        
             ''

     

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

+28

pkgs/development/libraries/fontconfig/config-compat.patch

···

       1
       1
       +
       commit 05c6adf8104b4321d3a3716a7b9feb6bf223ed0c (HEAD, nixpkgs)

     

       2
       2
       +
       Author: Vladimír Čunát <vcunat@gmail.com>

     

       3
       3
       +
       Date:   Tue Nov 4 12:24:25 2014 +0100

     

       4
       4
       +
       

     

       5
       5
       +
           add check for /etc/fonts/@configVersion@/fonts.conf

     

       6
       6
       +
           

     

       7
       7
       +
           It's checked between FONTCONFIG_FILE and the usual /etc/fonts/fonts.conf.

     

       8
       8
       +
           Also, hardcode /etc/fonts/fonts.conf to prevent accidental override.

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/src/fccfg.c b/src/fccfg.c

     

       11
       11
       +
       index 6377fd7..e9eb10a 100644

     

       12
       12
       +
       --- a/src/fccfg.c

     

       13
       13
       +
       +++ b/src/fccfg.c

     

       14
       14
       +
       @@ -2070,8 +2070,13 @@ FcConfigFilename (const FcChar8 *url)

     

       15
       15
       +
            if (!url || !*url)

     

       16
       16
       +
            {

     

       17
       17
       +
        	url = (FcChar8 *) getenv ("FONTCONFIG_FILE");

     

       18
       18
       +
       +	if (!url) {

     

       19
       19
       +
       +	    static const FcChar8 *cfPath = "/etc/fonts/@configVersion@/fonts.conf";

     

       20
       20
       +
       +	    if (access (cfPath, R_OK) == 0)

     

       21
       21
       +
       +		url = cfPath;

     

       22
       22
       +
       +	}

     

       23
       23
       +
        	if (!url)

     

       24
       24
       +
       -	    url = (FcChar8 *) FONTCONFIG_FILE;

     

       25
       25
       +
       +	    url = (FcChar8 *) "/etc/fonts/fonts.conf";

     

       26
       26
       +
            }

     

       27
       27
       +
            file = 0;

     

       28
       28
       +

+27 -9

pkgs/development/libraries/fontconfig/default.nix

···

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

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, fontbhttf

     

       2
       2
       +
       , substituteAll }:

     

       3
       3
       +
       

     

       4
       4
       +
       /** Font configuration scheme

     

       5
       5
       +
        - ./config-compat.patch makes fontconfig try the following root configs, in order:

     

       6
       6
       +
           $FONTCONFIG_FILE, /etc/fonts/${configVersion}/fonts.conf, /etc/fonts/fonts.conf

     

       7
       7
       +
           This is done not to override config of pre-2.11 versions (which just blow up)

     

       8
       8
       +
           and still use *global* font configuration at both NixOS or non-NixOS.

     

       9
       9
       +
        - NixOS creates /etc/fonts/${configVersion}/fonts.conf link to $out/etc/fonts/fonts.conf,

     

       10
       10
       +
           and other modifications should go to /etc/fonts/${configVersion}/conf.d

     

       11
       11
       +
        - See ./make-fonts-conf.xsl for config details.

     

       12
       12
       +
       

     

       13
       13
       +
       */

     

       2
       14
        
       

     

       3
       15
        
       let

     

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

     
···

       19
       31
        
             }

     

       20
       32
        
           ;

     

       21
       33
        
       

     

       22
       22
       -
         patches = [(fetchpatch {

     

       23
       23
       -
           url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67";

     

       24
       24
       -
           sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv";

     

       25
       25
       -
         })];

     

       34
       34
       +
         patches = [

     

       35
       35
       +
           (fetchpatch {

     

       36
       36
       +
             url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67";

     

       37
       37
       +
             sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv";

     

       38
       38
       +
           })

     

       39
       39
       +
           (substituteAll {

     

       40
       40
       +
             src = ./config-compat.patch;

     

       41
       41
       +
             inherit configVersion;

     

       42
       42
       +
           })

     

       43
       43
       +
         ];

     

       26
       44
        
       

     

       27
       45
        
         propagatedBuildInputs = [ freetype ];

     

       28
       28
       -
         buildInputs = [ pkgconfig libxslt expat ];

     

       46
       46
       +
         buildInputs = [ pkgconfig expat ];

     

       29
       47
        
       

     

       30
       48
        
         configureFlags = [

     

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

     

       49
       49
       +
           "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/

     

       32
       50
        
           "--disable-docs"

     

       51
       51
       +
           # just ~1MB; this is what you get when loading config fails for some reason

     

       33
       52
        
           "--with-default-fonts=${fontbhttf}"

     

       34
       53
        
         ];

     

       35
       54
        
       

     
···

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

     

       50
       69
        
         installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";

     

       51
       70
        
       

     

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

     

       53
       71
        
         postInstall = ''

     

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

     

       55
       73
        
           rm conf.d/{50-user,51-local}.conf

     

       56
       56
       -
           xsltproc --stringparam fontDirectories "${fontbhttf}" \

     

       74
       74
       +
           "${libxslt}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \

     

       57
       75
        
             --stringparam fontconfig "$out" \

     

       58
       76
        
             --stringparam fontconfigConfigVersion "${configVersion}" \

     

       59
       77
        
             --path $out/share/xml/fontconfig \