zettlr: replace texlive.combined.scheme-medium with texliveMedium

+5 -7
+2 -2
pkgs/applications/misc/zettlr/default.nix
··· 1 - { callPackage, texlive }: 2 3 - builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texlive; })) { 4 zettlr = { 5 version = "3.0.2"; 6 hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA=";
··· 1 + { callPackage, texliveMedium }: 2 3 + builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texliveMedium; })) { 4 zettlr = { 5 version = "3.0.2"; 6 hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA=";
+2 -2
pkgs/applications/misc/zettlr/generic.nix
··· 4 , appimageTools 5 , lib 6 , fetchurl 7 - , texlive 8 , pandoc 9 }: 10 ··· 23 inherit name src; 24 25 multiArch = false; # no 32bit needed 26 - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; 27 extraInstallCommands = '' 28 mv $out/bin/{${name},${pname}} 29 install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
··· 4 , appimageTools 5 , lib 6 , fetchurl 7 + , texliveMedium 8 , pandoc 9 }: 10 ··· 23 inherit name src; 24 25 multiArch = false; # no 32bit needed 26 + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ]; 27 extraInstallCommands = '' 28 mv $out/bin/{${name},${pname}} 29 install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
+1 -3
pkgs/top-level/all-packages.nix
··· 41965 41966 zalgo = callPackage ../tools/misc/zalgo { }; 41967 41968 - inherit (callPackage ../applications/misc/zettlr { 41969 - texlive = texlive.combined.scheme-medium; 41970 - }) zettlr; 41971 41972 unpoller = callPackage ../servers/monitoring/unpoller { }; 41973
··· 41965 41966 zalgo = callPackage ../tools/misc/zalgo { }; 41967 41968 + inherit (callPackage ../applications/misc/zettlr { }) zettlr; 41969 41970 unpoller = callPackage ../servers/monitoring/unpoller { }; 41971