diff options
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r-- | pkgs/tools/typesetting/tex/dblatex/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/nix/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 4574b44f8448e..39069029e57c5 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, libxslt, texliveBasic +{ lib, stdenv, fetchurl, python311, libxslt, texliveBasic , enableAllFeatures ? false, imagemagick, fig2dev, inkscape, fontconfig, ghostscript , tex ? texliveBasic.withPackages (ps: with ps; [ # satisfy all packages that ./configure mentions @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n"; }; - buildInputs = [ python3 libxslt tex ] + buildInputs = [ python311 libxslt tex ] ++ lib.optionals enableAllFeatures [ imagemagick fig2dev ]; # TODO: dblatex tries to execute texindy command, but nixpkgs doesn't have @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - ${python3.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose + ${python311.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose ''; passthru = { inherit tex; }; diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index e9017333c943c..feb444b98ff49 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -243,7 +243,7 @@ rec { # fonts. fontsConf = pkgs.makeFontsConf { fontDirectories = [ - "${pkgs.ghostscript}/share/ghostscript/fonts" + "${pkgs.ghostscript.fonts}/share/fonts" ]; }; diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix index e289f9171c158..1356fc325047e 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix @@ -233,7 +233,7 @@ let # if the container is missing (that is, outputs == [ ]), create a file, to prevent passing the package to .withPackages '' for outputName in ''${!outputs[@]} ; do - if [[ -z ''${outputDrvs[$outputName]} ]] ; then + if [[ -n ''${outputDrvs[$outputName]} ]] ; then ln -s "''${outputDrvs[$outputName]}" "''${outputs[$outputName]}" else touch "''${outputs[$outputName]}" |