pyrox.dev
Merge pull request #69129 from eadwu/typora/include-pandoc
typora: allow pandoc to be in PATH
authored by worldofpeace and committed by GitHub 19b4d188 9a9760d8
+16
-3
pkgs/applications/editors/typora/default.nix
+16
-3
pkgs/applications/editors/typora/default.nix
···
1
-
{ stdenv, fetchurl, makeWrapper, electron_5, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }:
2
3
stdenv.mkDerivation rec {
4
pname = "typora";
···
42
makeWrapper ${electron_5}/bin/electron $out/bin/typora \
43
--add-flags $out/share/typora \
44
"''${gappsWrapperArgs[@]}" \
45
-
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
46
'';
47
48
-
meta = with stdenv.lib; {
49
description = "A minimal Markdown reading & writing app";
50
homepage = https://typora.io;
51
license = licenses.unfree;
···
1
+
{ stdenv
2
+
, lib
3
+
, fetchurl
4
+
, makeWrapper
5
+
, electron_5
6
+
, dpkg
7
+
, gtk3
8
+
, glib
9
+
, gsettings-desktop-schemas
10
+
, wrapGAppsHook
11
+
, withPandoc ? false
12
+
, pandoc
13
+
}:
14
15
stdenv.mkDerivation rec {
16
pname = "typora";
···
54
makeWrapper ${electron_5}/bin/electron $out/bin/typora \
55
--add-flags $out/share/typora \
56
"''${gappsWrapperArgs[@]}" \
57
+
${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \
58
+
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
59
'';
60
61
+
meta = with lib; {
62
description = "A minimal Markdown reading & writing app";
63
homepage = https://typora.io;
64
license = licenses.unfree;