Unverified Commit 93b63a2c authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by GitHub
Browse files

Merge pull request #265514 from xworld21/treewide-texlive-with-packages 

treewide: switch to texlive.withPackages
parents 61a70ae2 f5edeac4

pkgs/applications/editors/apostrophe/default.nix

+3 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitLab, meson, ninja

, wrapGAppsHook, pkg-config, desktop-file-utils

, appstream-glib, pythonPackages, glib, gobject-introspection

, gtk3, webkitgtk, glib-networking, gnome, gspell, texlive

, gtk3, webkitgtk, glib-networking, gnome, gspell, texliveMedium

, shared-mime-info, libhandy, fira, sassc

}:
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { 
    appstream-glib wrapGAppsHook sassc gobject-introspection ];



  buildInputs = [ glib pythonEnv gtk3

    gnome.adwaita-icon-theme webkitgtk gspell texlive

    gnome.adwaita-icon-theme webkitgtk gspell texliveMedium

    glib-networking libhandy ];



  postPatch = ''
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { 
  preFixup = ''

    gappsWrapperArgs+=(

      --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/"

      --prefix PATH : "${texlive}/bin"

      --prefix PATH : "${texliveMedium}/bin"

      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"

    )

  '';

pkgs/applications/editors/ne/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, ncurses, texinfo6, texlive, perl, ghostscript }:

{ lib, stdenv, fetchFromGitHub, ncurses, texinfo6, texliveMedium, perl, ghostscript }:



stdenv.mkDerivation rec {

  pname = "ne";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec { 
    substituteInPlace src/makefile --replace "-lcurses" "-lncurses"

  '';



  nativeBuildInputs = [ texlive.combined.scheme-medium texinfo6 perl ghostscript ];

  nativeBuildInputs = [ texliveMedium texinfo6 perl ghostscript ];

  buildInputs = [ ncurses ];



  makeFlags = [ "PREFIX=${placeholder "out"}" ];

pkgs/applications/editors/texmacs/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  guile_1_8, xmodmap, which, freetype,

  libjpeg,

  sqlite,

  tex ? null,

  texliveSmall ? null,

  aspell ? null,

  git ? null,

  python3 ? null,
@@ -23,7 +23,8 @@ let 
  pname = "texmacs";

  version = "2.1.2";

  common = callPackage ./common.nix {

    inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;

    inherit extraFonts chineseFonts japaneseFonts koreanFonts;

    tex = texliveSmall;

  };

in

stdenv.mkDerivation {
@@ -70,7 +71,7 @@ stdenv.mkDerivation { 
      which

      ghostscriptX

      aspell

      tex

      texliveSmall

      git

      python3

    ])

pkgs/applications/graphics/ipe/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
, libspiro

, lua5

, qtbase

, texlive

, texliveSmall

, wrapQtAppsHook

, zlib

, withTeXLive ? true
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec { 
    qtbase

    zlib

  ] ++ (lib.optionals withTeXLive [

    texlive

    texliveSmall

  ]);



  makeFlags = [
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec { 
    "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged

  ];



  qtWrapperArgs = lib.optionals withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texlive ]}" ];

  qtWrapperArgs = lib.optionals withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texliveSmall ]}" ];



  enableParallelBuilding = true;

pkgs/applications/misc/therion/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
, expat

, bwidget

, python3

, texlive

, texliveTeTeX

, survex

, makeWrapper

, fmt
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec { 
    pkg-config

    perl

    python3

    texlive.combined.scheme-tetex

    texliveTeTeX

    makeWrapper

    tcl.tclPackageHook

  ];
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec { 
  fixupPhase = ''

    runHook preFixup

    wrapProgram $out/bin/therion \

      --prefix PATH : ${lib.makeBinPath [ survex texlive.combined.scheme-tetex ]}

      --prefix PATH : ${lib.makeBinPath [ survex texliveTeTeX ]}

    wrapProgram $out/bin/xtherion \

      --prefix PATH : ${lib.makeBinPath [ tk ]}

    runHook postFixup