diff options
| author | Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> | 2023-11-04 20:02:28 +0000 |
|---|---|---|
| committer | Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> | 2023-11-05 11:56:03 +0000 |
| commit | 803eae4c8310b4eed6fb44cfe9982fa5b8f4b4a9 (patch) | |
| tree | dc8a6832ac2449cc6c4603db7df99d6ac2cae942 | |
| parent | 2a0440c2a40338e7f6e223093dd40acc27f77353 (diff) | |
| download | nixlib-803eae4c8310b4eed6fb44cfe9982fa5b8f4b4a9.tar nixlib-803eae4c8310b4eed6fb44cfe9982fa5b8f4b4a9.tar.gz nixlib-803eae4c8310b4eed6fb44cfe9982fa5b8f4b4a9.tar.bz2 nixlib-803eae4c8310b4eed6fb44cfe9982fa5b8f4b4a9.tar.lz nixlib-803eae4c8310b4eed6fb44cfe9982fa5b8f4b4a9.tar.xz nixlib-803eae4c8310b4eed6fb44cfe9982fa5b8f4b4a9.tar.zst nixlib-803eae4c8310b4eed6fb44cfe9982fa5b8f4b4a9.zip | |
zettlr: replace texlive.combined.scheme-medium with texliveMedium
| -rw-r--r-- | pkgs/applications/misc/zettlr/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/zettlr/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 5 insertions, 7 deletions
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 { }; |