summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorDmitry Kalinkin <dmitry.kalinkin@gmail.com>2023-11-06 16:47:04 -0500
committerGitHub <noreply@github.com>2023-11-06 16:47:04 -0500
commit93b63a2cabbd80a7c7727b447664714757defa6a (patch)
tree84a5b7cdbaae36f211fa8af9a351bd42b9abc133 /pkgs/applications/video
parent61a70ae22d3cf4ed3ad5229e7f4b0804c63ac104 (diff)
parentf5edeac421435433eb651ae520ae0b9994c2d07b (diff)
downloadnixpkgs-93b63a2cabbd80a7c7727b447664714757defa6a.tar
nixpkgs-93b63a2cabbd80a7c7727b447664714757defa6a.tar.gz
nixpkgs-93b63a2cabbd80a7c7727b447664714757defa6a.tar.bz2
nixpkgs-93b63a2cabbd80a7c7727b447664714757defa6a.tar.lz
nixpkgs-93b63a2cabbd80a7c7727b447664714757defa6a.tar.xz
nixpkgs-93b63a2cabbd80a7c7727b447664714757defa6a.tar.zst
nixpkgs-93b63a2cabbd80a7c7727b447664714757defa6a.zip
Merge pull request #265514 from xworld21/treewide-texlive-with-packages
treewide: switch to texlive.withPackages
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/manim/default.nix15
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix
index 9c7b0edb3bd..99876564871 100644
--- a/pkgs/applications/video/manim/default.nix
+++ b/pkgs/applications/video/manim/default.nix
@@ -4,7 +4,7 @@
 
 , cairo
 , ffmpeg
-, texlive
+, texliveInfraOnly
 
 , python3
 }:
@@ -21,11 +21,10 @@ let
   #   https://github.com/yihui/tinytex/blob/master/tools/pkgs-custom.txt
   #
   # these two combined add up to:
-  manim-tinytex = {
-    inherit (texlive)
+  manim-tinytex = texliveInfraOnly.withPackages (ps: with ps; [
 
     # tinytex
-    scheme-infraonly amsfonts amsmath atbegshi atveryend auxhook babel bibtex
+    amsfonts amsmath atbegshi atveryend auxhook babel bibtex
     bigintcalc bitset booktabs cm dehyph dvipdfmx dvips ec epstopdf-pkg etex
     etexcmds etoolbox euenc everyshi fancyvrb filehook firstaid float fontspec
     framed geometry gettitlestring glyphlist graphics graphics-cfg graphics-def
@@ -41,8 +40,8 @@ let
     # manim-latex
     standalone everysel preview doublestroke ms setspace rsfs relsize ragged2e
     fundus-calligra microtype wasysym physics dvisvgm jknapltx wasy cm-super
-    babel-english gnu-freefont mathastext cbfonts-fd;
-  };
+    babel-english gnu-freefont mathastext cbfonts-fd
+  ]);
 
   python = python3.override {
     packageOverrides = self: super: {
@@ -129,13 +128,13 @@ in python.pkgs.buildPythonApplication rec {
   makeWrapperArgs = [
     "--prefix" "PATH" ":" (lib.makeBinPath [
       ffmpeg
-      (texlive.combine manim-tinytex)
+      manim-tinytex
     ])
   ];
 
   nativeCheckInputs = [
     ffmpeg
-    (texlive.combine manim-tinytex)
+    manim-tinytex
   ] ++ (with python.pkgs; [
     pytest-xdist
     pytestCheckHook