diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2020-12-06 16:08:15 +0100 |
|---|---|---|
| committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-02-16 13:05:56 +0100 |
| commit | 5db97c0fb8db0cb9582786ee5db166396233a2c1 (patch) | |
| tree | bf0fc5f1b871e66c2adbbefbfdacac226b7aee77 /pkgs/applications/misc/zettlr | |
| parent | 99eeda9fdbd36022694f413f9d79fd626b95e849 (diff) | |
| download | nixpkgs-5db97c0fb8db0cb9582786ee5db166396233a2c1.tar nixpkgs-5db97c0fb8db0cb9582786ee5db166396233a2c1.tar.gz nixpkgs-5db97c0fb8db0cb9582786ee5db166396233a2c1.tar.bz2 nixpkgs-5db97c0fb8db0cb9582786ee5db166396233a2c1.tar.lz nixpkgs-5db97c0fb8db0cb9582786ee5db166396233a2c1.tar.xz nixpkgs-5db97c0fb8db0cb9582786ee5db166396233a2c1.tar.zst nixpkgs-5db97c0fb8db0cb9582786ee5db166396233a2c1.zip | |
zettlr: 1.7.5 -> 1.8.7
Some files in the appimage changed from 'zettlr' to 'Zettlr', keeping
them as lowercase in package output for consistency.
Add texlive and pandoc{,-citeproc} for PDF export.
Diffstat (limited to 'pkgs/applications/misc/zettlr')
| -rw-r--r-- | pkgs/applications/misc/zettlr/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 3d762d9ab2a..4b9627a843b 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -1,13 +1,15 @@ -{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas}: +{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas +, texlive, pandoc, pandoc-citeproc +}: # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "1.7.5"; + version = "1.8.7"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "040lx01ywdpla34d4abkmh51kchr11s17la6fk6yq77y8zb87xzi"; + sha256 = "0zbmlk5qk92b3zycs0bmdwgc8fn4a4dv1yvq9q8q2wxz4ammx6c0"; }; appimageContents = appimageTools.extractType2 { inherit name src; @@ -20,11 +22,11 @@ in appimageTools.wrapType2 rec { ''; multiPkgs = null; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc pandoc-citeproc ]; extraInstallCommands = '' mv $out/bin/{${name},${pname}} - install -m 444 -D ${appimageContents}/zettlr.desktop $out/share/applications/zettlr.desktop - install -m 444 -D ${appimageContents}/zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png + install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/zettlr.desktop + install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}' ''; |