diff options
author | Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> | 2023-11-04 20:02:32 +0000 |
---|---|---|
committer | Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> | 2023-11-05 13:43:29 +0000 |
commit | 25708f8e5a386a0fd0ff2418541bcbf0983296f4 (patch) | |
tree | 69ee5a74e6e5ce91beeaea78fa533de5a4b6309d | |
parent | 5fcdb283198755f57a67678573cc61e3b11aa4d7 (diff) | |
download | nixpkgs-25708f8e5a386a0fd0ff2418541bcbf0983296f4.tar nixpkgs-25708f8e5a386a0fd0ff2418541bcbf0983296f4.tar.gz nixpkgs-25708f8e5a386a0fd0ff2418541bcbf0983296f4.tar.bz2 nixpkgs-25708f8e5a386a0fd0ff2418541bcbf0983296f4.tar.lz nixpkgs-25708f8e5a386a0fd0ff2418541bcbf0983296f4.tar.xz nixpkgs-25708f8e5a386a0fd0ff2418541bcbf0983296f4.tar.zst nixpkgs-25708f8e5a386a0fd0ff2418541bcbf0983296f4.zip |
asymptote: replace texlive.combine with texliveSmall.withPackages
-rw-r--r-- | pkgs/tools/graphics/asymptote/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index a03799b5ed8..a5968425f5d 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7430470115b..f27f54aa933 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |