diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-07 00:02:31 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-07 00:02:31 +0000 |
commit | 38bc2a577e066ed5bac95162e64615be86402216 (patch) | |
tree | a86c4435a02d3ea4b973ab1dc6eb725c7438be72 /pkgs/tools/graphics | |
parent | 6a9ebf2ffed672e1920bc30cb9bcfca97995470b (diff) | |
parent | fe3d292f2ce29cbc121d4aa6242545d56a5034bf (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/asymptote/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/enblend-enfuse/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index a03799b5ed85e..a5968425f5d88 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -4,7 +4,7 @@ , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , python3, qtbase, qtsvg, boost , zlib, perl, curl -, texLive, texinfo +, texliveSmall, texinfo , darwin }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ghostscriptX imagemagick fftw boehmgc ncurses readline gsl libsigsegv zlib perl curl qtbase qtsvg boost - texLive + (texliveSmall.withPackages (ps: with ps; [ epsf cm-super ps.texinfo media9 ocgx2 collection-latexextra ])) (python3.withPackages (ps: with ps; [ cson numpy pyqt5 ])) ]; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 2fffa3bfa9c72..f47a2aa961e6f 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -13,7 +13,7 @@ , help2man , pkg-config , perl -, texlive +, texliveSmall }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ]; - nativeBuildInputs = [ autoreconfHook help2man perl pkg-config texlive.combined.scheme-small ]; + nativeBuildInputs = [ autoreconfHook help2man perl pkg-config texliveSmall ]; preConfigure = '' patchShebangs src/embrace diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index f76919b0bc550..f0fa45e59e4d9 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, texinfo , cairo, gd, libcerf, pango, readline, zlib -, withTeXLive ? false, texlive +, withTeXLive ? false, texliveSmall , withLua ? false, lua , withCaca ? false, libcaca , libX11 ? null @@ -32,7 +32,7 @@ in buildInputs = [ cairo gd libcerf pango readline zlib ] - ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) + ++ lib.optional withTeXLive texliveSmall ++ lib.optional withLua lua ++ lib.optional withCaca libcaca ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] |