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.
This commit is contained in:
parent
99eeda9fdb
commit
5db97c0fb8
|
@ -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.
|
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||||
let
|
let
|
||||||
pname = "zettlr";
|
pname = "zettlr";
|
||||||
version = "1.7.5";
|
version = "1.8.7";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||||
sha256 = "040lx01ywdpla34d4abkmh51kchr11s17la6fk6yq77y8zb87xzi";
|
sha256 = "0zbmlk5qk92b3zycs0bmdwgc8fn4a4dv1yvq9q8q2wxz4ammx6c0";
|
||||||
};
|
};
|
||||||
appimageContents = appimageTools.extractType2 {
|
appimageContents = appimageTools.extractType2 {
|
||||||
inherit name src;
|
inherit name src;
|
||||||
|
@ -20,11 +22,11 @@ in appimageTools.wrapType2 rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiPkgs = null; # no 32bit needed
|
multiPkgs = null; # no 32bit needed
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc pandoc-citeproc ];
|
||||||
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
|
||||||
install -m 444 -D ${appimageContents}/zettlr.png $out/share/icons/hicolor/512x512/apps/zettlr.png
|
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}'
|
substituteInPlace $out/share/applications/zettlr.desktop --replace 'Exec=AppRun' 'Exec=${pname}'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -29975,7 +29975,10 @@ in
|
||||||
|
|
||||||
zalgo = callPackage ../tools/misc/zalgo { };
|
zalgo = callPackage ../tools/misc/zalgo { };
|
||||||
|
|
||||||
zettlr = callPackage ../applications/misc/zettlr { };
|
zettlr = callPackage ../applications/misc/zettlr {
|
||||||
|
texlive = texlive.combined.scheme-medium;
|
||||||
|
inherit (haskellPackages) pandoc-citeproc;
|
||||||
|
};
|
||||||
|
|
||||||
unifi-poller = callPackage ../servers/monitoring/unifi-poller {};
|
unifi-poller = callPackage ../servers/monitoring/unifi-poller {};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue