commit af4cf4d6ae4a47fc9a8b58ea6238455a3acf0292 · pyrox.dev/nixpkgs

+8 -2

pkgs/test/texlive/default.nix

···

       11
       11
        
           diff -u "''${nixpkgsTlpdbNix}" "''${tlpdbNix}" | tee "$out/tlpdb.nix.patch"

     

       12
       12
        
         '';

     

       13
       13
        
       

     

       14
       14
       -
         luaotfload-fonts = runCommand "texlive-test-lualatex" {

     

       14
       14
       +
         opentype-fonts = runCommand "texlive-test-opentype" {

     

       15
       15
        
           nativeBuildInputs = [

     

       16
       16
        
             (with texlive; combine { inherit scheme-medium libertinus-fonts; })

     

       17
       17
        
           ];

     

       18
       18
       -
           input = builtins.toFile "lualatex-testfile.tex" ''

     

       18
       18
       +
           input = builtins.toFile "opentype-testfile.tex" ''

     

       19
       19
        
             \documentclass{article}

     

       20
       20
        
             \usepackage{fontspec}

     

       21
       21
        
             \setmainfont{Libertinus Serif}

     
···

       26
       26
        
         }

     

       27
       27
        
         ''

     

       28
       28
        
           export HOME="$(mktemp -d)"

     

       29
       29
       +
           # We use the same testfile to test two completely different

     

       30
       30
       +
           # font discovery mechanisms, both of which were once broken:

     

       31
       31
       +
           #  - lualatex uses its own luaotfload script (#220228)

     

       32
       32
       +
           #  - xelatex uses fontconfig (#228196)

     

       33
       33
       +
           # both of the following two commands need to succeed.

     

       29
       34
        
           lualatex -halt-on-error "$input"

     

       35
       35
       +
           xelatex -halt-on-error "$input"

     

       30
       36
        
           echo success > $out

     

       31
       37
        
         '';

     

       32
       38

+11 -5

pkgs/tools/typesetting/tex/texlive/combine.nix

···

       82
       82
        
         nativeBuildInputs = [ makeWrapper libfaketime perl bin.texlinks ];

     

       83
       83
        
         buildInputs = pkgList.extraInputs;

     

       84
       84
        
       

     

       85
       85
       -
         # This is set primarily to help find-tarballs.nix to do its job

     

       86
       86
       -
         passthru.packages = pkgList.all;

     

       85
       85
       +
         passthru = {

     

       86
       86
       +
           # This is set primarily to help find-tarballs.nix to do its job

     

       87
       87
       +
           packages = pkgList.all;

     

       88
       88
       +
           # useful for inclusion in the `fonts.fonts` nixos option or for use in devshells

     

       89
       89
       +
           fonts = "${texmfroot}/texmf-dist/fonts";

     

       90
       90
       +
         };

     

       87
       91
        
       

     

       88
       92
        
         postBuild = ''

     

       89
       93
        
           TEXMFROOT="${texmfroot}"

     
···

       196
       200
        
             makeWrapper "$target" "$link" \

     

       197
       201
        
               --prefix PATH : "${gnused}/bin:${gnugrep}/bin:${coreutils}/bin:$out/bin:${perl}/bin" \

     

       198
       202
        
               --prefix PERL5LIB : "$PERL5LIB" \

     

       199
       199
       -
               --set-default TEXMFCNF "$TEXMFCNF"

     

       203
       203
       +
               --set-default TEXMFCNF "$TEXMFCNF" \

     

       204
       204
       +
               --set-default FONTCONFIG_FILE "${

     

       205
       205
       +
                 # neccessary for XeTeX to find the fonts distributed with texlive

     

       206
       206
       +
                 makeFontsConf { fontDirectories = [ "${texmfroot}/texmf-dist/fonts" ]; }

     

       207
       207
       +
               }"

     

       200
       208
        
       

     

       201
       209
        
             # avoid using non-nix shebang in $target by calling interpreter

     

       202
       210
        
             if [[ "$(head -c 2 "$target")" = "#!" ]]; then

     
···

       311
       319
        
         ''

     

       312
       320
        
         ;

     

       313
       321
        
       }).overrideAttrs (_: { allowSubstitutes = true; })

     

       314
       314
       -
       # TODO: make TeX fonts visible by fontconfig: it should be enough to install an appropriate file

     

       315
       315
       -
       #       similarly, deal with xe(la)tex font visibility?

+2 -2

pkgs/tools/typesetting/tex/texlive/default.nix

···

       5
       5
        
       { stdenv, lib, fetchurl, runCommand, writeText, buildEnv

     

       6
       6
        
       , callPackage, ghostscript_headless, harfbuzz

     

       7
       7
        
       , makeWrapper, python3, ruby, perl, gnused, gnugrep, coreutils

     

       8
       8
       -
       , libfaketime

     

       8
       8
       +
       , libfaketime, makeFontsConf

     

       9
       9
        
       , useFixedHashes ? true

     

       10
       10
        
       , recurseIntoAttrs

     

       11
       11
        
       }:

     
···

       24
       24
        
         # function for creating a working environment from a set of TL packages

     

       25
       25
        
         combine = import ./combine.nix {

     

       26
       26
        
           inherit bin combinePkgs buildEnv lib makeWrapper writeText

     

       27
       27
       -
             stdenv python3 ruby perl gnused gnugrep coreutils libfaketime;

     

       27
       27
       +
             stdenv python3 ruby perl gnused gnugrep coreutils libfaketime makeFontsConf;

     

       28
       28
        
           ghostscript = ghostscript_headless;

     

       29
       29
        
         };

     

       30
       30