colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vincenzo Mantova 2023-11-04 20:02:28 +00:00
parent 2a0440c2a4
commit 803eae4c83
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/zettlr/default.nix
View File

@ -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 = { zettlr = {
version = "3.0.2"; version = "3.0.2";
hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA="; hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA=";

4
pkgs/applications/misc/zettlr/generic.nix
View File

@ -4,7 +4,7 @@
, appimageTools , appimageTools
, lib , lib
, fetchurl , fetchurl
, texlive , texliveMedium
, pandoc , pandoc
}: }:
@ -23,7 +23,7 @@ appimageTools.wrapType2 rec {
inherit name src; inherit name src;
multiArch = false; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ];
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/{${name},${pname}} mv $out/bin/{${name},${pname}}
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop

4
pkgs/top-level/all-packages.nix
View File

@ -41965,9 +41965,7 @@ with pkgs;
zalgo = callPackage ../tools/misc/zalgo { }; zalgo = callPackage ../tools/misc/zalgo { };
inherit (callPackage ../applications/misc/zettlr { inherit (callPackage ../applications/misc/zettlr { }) zettlr;
texlive = texlive.combined.scheme-medium;
}) zettlr;
unpoller = callPackage ../servers/monitoring/unpoller { }; unpoller = callPackage ../servers/monitoring/unpoller { };