From 909531d25524082b7be5dac4d18a0dcc59f080c7 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sat, 4 Nov 2023 20:02:29 +0000 Subject: [PATCH] ipe: replace texlive.combine with texliveSmall --- pkgs/applications/graphics/ipe/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 834ab6198a87..59fe59e910fb 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -13,7 +13,7 @@ , libspiro , lua5 , qtbase -, texlive +, texliveSmall , wrapQtAppsHook , zlib , withTeXLive ? true @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { qtbase zlib ] ++ (lib.optionals withTeXLive [ - texlive + texliveSmall ]); makeFlags = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged ]; - qtWrapperArgs = lib.optionals withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texlive ]}" ]; + qtWrapperArgs = lib.optionals withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texliveSmall ]}" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e672b06e0e65..5f881376cf0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32914,7 +32914,6 @@ with pkgs; ipe = qt6Packages.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; - texlive = texlive.combine { inherit (texlive) scheme-small; }; lua5 = lua5_3; };