Commit 69899e59 authored by Vincenzo Mantova's avatar Vincenzo Mantova
Browse files

R: replace texlive.combine with texliveSmall.withPackages

parent 32be1224

pkgs/applications/science/math/R/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng

, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texlive, texLive, tk, xz, zlib

, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texlive, texliveSmall, tk, xz, zlib

, less, texinfo, graphviz, icu, pkg-config, bison, imake, which, jdk, blas, lapack

, curl, Cocoa, Foundation, libobjc, libcxx, tzdata

, withRecommendedPackages ? true
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [ pkg-config ];

  buildInputs = [

    bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses

    pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu

    pango pcre2 perl readline (texliveSmall.withPackages (ps: with ps; [ inconsolata helvetic ps.texinfo fancyvrb cm-super rsfs ])) xz zlib less texinfo graphviz icu

    bison imake which blas lapack curl tcl tk jdk tzdata

  ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];

pkgs/top-level/all-packages.nix

+0 −3
Original line number Diff line number Diff line
@@ -26086,9 +26086,6 @@ with pkgs; 














  R = darwin.apple_sdk_11_0.callPackage ../applications/science/math/R {















    # TODO: split docs into a separate output













    texLive = texlive.combine {













      inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super rsfs;













    };















    withRecommendedPackages = false;















    inherit (darwin.apple_sdk_11_0.frameworks) Cocoa Foundation;















    inherit (darwin) libobjc;