diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 88f3cd5540a0..75e310cdffec 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -1,6 +1,6 @@ -{ callPackage, texlive }: +{ callPackage, texliveMedium }: -builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texlive; })) { +builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texliveMedium; })) { zettlr = { version = "3.0.2"; hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA="; diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index 4a8bcbd8549e..671577b61ba7 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -4,7 +4,7 @@ , appimageTools , lib , fetchurl -, texlive +, texliveMedium , pandoc }: @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { inherit name src; multiArch = false; # no 32bit needed - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ]; extraInstallCommands = '' mv $out/bin/{${name},${pname}} install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a01d12acac74..e672b06e0e65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41965,9 +41965,7 @@ with pkgs; zalgo = callPackage ../tools/misc/zalgo { }; - inherit (callPackage ../applications/misc/zettlr { - texlive = texlive.combined.scheme-medium; - }) zettlr; + inherit (callPackage ../applications/misc/zettlr { }) zettlr; unpoller = callPackage ../servers/monitoring/unpoller { };