Merge pull request #69129 from eadwu/typora/include-pandoc
typora: allow pandoc to be in PATH
This commit is contained in:
commit
19b4d18893
@ -1,4 +1,16 @@
|
||||
{ stdenv, fetchurl, makeWrapper, electron_5, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, makeWrapper
|
||||
, electron_5
|
||||
, dpkg
|
||||
, gtk3
|
||||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
, wrapGAppsHook
|
||||
, withPandoc ? false
|
||||
, pandoc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "typora";
|
||||
@ -42,10 +54,11 @@ stdenv.mkDerivation rec {
|
||||
makeWrapper ${electron_5}/bin/electron $out/bin/typora \
|
||||
--add-flags $out/share/typora \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
|
||||
${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A minimal Markdown reading & writing app";
|
||||
homepage = https://typora.io;
|
||||
license = licenses.unfree;
|
||||
|
Loading…
Reference in New Issue
Block a user