From e132b36dcee39b00cf7005fbc7c65496657fa509 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sat, 4 Nov 2023 20:02:27 +0000 Subject: [PATCH] apostrophe: replace texlive.combined.scheme-medium with texliveMedium --- pkgs/applications/editors/apostrophe/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 00bb6dea3256..bbc84b4caa5e 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, meson, ninja , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection -, gtk3, webkitgtk, glib-networking, gnome, gspell, texlive +, gtk3, webkitgtk, glib-networking, gnome, gspell, texliveMedium , shared-mime-info, libhandy, fira, sassc }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { appstream-glib wrapGAppsHook sassc gobject-introspection ]; buildInputs = [ glib pythonEnv gtk3 - gnome.adwaita-icon-theme webkitgtk gspell texlive + gnome.adwaita-icon-theme webkitgtk gspell texliveMedium glib-networking libhandy ]; postPatch = '' @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/" - --prefix PATH : "${texlive}/bin" + --prefix PATH : "${texliveMedium}/bin" --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" ) ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce688c174e77..a3db85273742 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30438,7 +30438,6 @@ with pkgs; apostrophe = callPackage ../applications/editors/apostrophe { pythonPackages = python3Packages; - texlive = texlive.combined.scheme-medium; }; ardour = callPackage ../applications/audio/ardour { };