Commit dfb412e5 authored by Vincenzo Mantova's avatar Vincenzo Mantova
Browse files

texlive.bin: inherit arguments from texlive 

The change allows texlive.override to work as expected.
parent 2434d0be

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

+9 −8
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  gd,

  libxaw,

  icu,

  ghostscript,

  ghostscript_headless,

  libxpm,

  libxmu,

  libxext,
@@ -29,7 +29,7 @@ 
  libpaper,

  graphite2,

  zziplib,

  harfbuzz,

  harfbuzzFull,

  potrace,

  gmp,

  mpfr,
@@ -44,11 +44,12 @@ 
  woff2,

  xxHash,

  makeWrapper,

  useFixedHashes,

  useFixedHashes ? true,

  asymptote,

  biber-ms,

  tlpdb,

  luajit,

  ...

}@args:



# Useful resource covering build options:
@@ -411,7 +412,7 @@ rec { 
    buildInputs = core.buildInputs ++ [

      core

      cairo

      harfbuzz

      harfbuzzFull

      icu

      graphite2

      libx11
@@ -607,7 +608,7 @@ rec { 
    buildInputs = [

      core

      brotli

      ghostscript

      ghostscript_headless

      zlib

      freetype

      ttfautohint
@@ -637,7 +638,7 @@ rec { 
      libpng

      freetype

      gd

      ghostscript

      ghostscript_headless

    ];



    preConfigure = ''
@@ -651,7 +652,7 @@ rec { 
      "--disable-debug"

    ];



    GS = "${ghostscript}/bin/gs";

    GS = lib.getExe ghostscript_headless;



    enableParallelBuilding = true;

  };
@@ -750,7 +751,7 @@ rec { 
    buildInputs = [

      core # kpathsea

      freetype

      ghostscript

      ghostscript_headless

      libx11

      libxaw

      libxi

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

+41 −12
Original line number Diff line number Diff line
@@ -12,10 +12,9 @@ 
  writeShellScript,

  writeText,

  buildEnv,

  callPackage,

  ghostscript_headless,

  git-latexdiff,

  harfbuzz,

  harfbuzzFull,

  makeWrapper,

  installShellFiles,

  python3,
@@ -45,18 +44,48 @@ 
  extraMirrors ? [ ],

  nixfmt,

  luajit,

}:

  # for bin.nix

  perlPackages,

  python3Packages,

  pkg-config,

  cmake,

  ninja,

  libpaper,

  graphite2,

  zziplib,

  potrace,

  gmp,

  mpfr,

  mupdf-headless,

  brotli,

  cairo,

  pixman,

  libxi,

  libxfixes,

  clisp,

  biber,

  woff2,

  xxHash,

  fetchzip,

  fetchFromGitHub,

  buildPackages,

  texlive,

  zlib,

  libiconv,

  libpng,

  libx11,

  freetype,

  ttfautohint,

  gd,

  libxaw,

  icu,

  libxpm,

  libxmu,

  libxext,

}@args:

let

  # various binaries (compiled)

  bin = callPackage ./bin.nix {

    ghostscript = ghostscript_headless;

    harfbuzz = harfbuzz.override {

      withIcu = true;

      withGraphite2 = true;

    };

    inherit useFixedHashes;

    tlpdb = overriddenTlpdb;

  };

  bin = import ./bin.nix (args // { tlpdb = overriddenTlpdb; });



  tlpdb = import ./tlpdb.nix;