nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

R: replace texlive.combine with texliveSmall.withPackages

Browse Source
This commit is contained in:
Vincenzo Mantova 2023-11-04 20:02:33 +00:00
parent 32be122447
commit 69899e59a2
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/math/R/default.nix
View File

@ -1,5 +1,5 @@
{ 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 ];

3
pkgs/top-level/all-packages.nix
View File

@ -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;