Commit 25708f8e authored by Vincenzo Mantova's avatar Vincenzo Mantova
Browse files

asymptote: replace texlive.combine with texliveSmall.withPackages

parent 5fcdb283

pkgs/tools/graphics/asymptote/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ]))

  ];

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -3319,9 +3319,7 @@ with pkgs; 














  astc-encoder = callPackage ../tools/graphics/astc-encoder { };



























  asymptote = libsForQt5.callPackage ../tools/graphics/asymptote {













    texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo media9 ocgx2 collection-latexextra; };













  };













  asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };





























  async = callPackage ../development/tools/async { };