From cdc9dba2bcc1d4a54aa37e3a8b3d37a00cef9777 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sat, 4 Nov 2023 20:02:30 +0000 Subject: [PATCH] texmacs: replace texlive.combined.scheme-small with texliveSmall --- pkgs/applications/editors/texmacs/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 00372c1cab8b..5d6c3687a0be 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -2,7 +2,7 @@ guile_1_8, xmodmap, which, freetype, libjpeg, sqlite, - tex ? null, + texliveSmall ? null, aspell ? null, git ? null, python3 ? null, @@ -23,7 +23,8 @@ let pname = "texmacs"; version = "2.1.2"; common = callPackage ./common.nix { - inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; + inherit extraFonts chineseFonts japaneseFonts koreanFonts; + tex = texliveSmall; }; in stdenv.mkDerivation { @@ -70,7 +71,7 @@ stdenv.mkDerivation { which ghostscriptX aspell - tex + texliveSmall git python3 ]) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 526479ba49f0..8104528427b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13830,7 +13830,6 @@ with pkgs; texmacs = libsForQt5.callPackage ../applications/editors/texmacs { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - tex = texlive.combined.scheme-small; extraFonts = true; };