mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
typora: allow pandoc to be in PATH
This commit is contained in:
parent
889537352b
commit
55ebe58462
1 changed files with 16 additions and 3 deletions
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "typora";
|
pname = "typora";
|
||||||
|
@ -42,10 +54,11 @@ stdenv.mkDerivation rec {
|
||||||
makeWrapper ${electron_5}/bin/electron $out/bin/typora \
|
makeWrapper ${electron_5}/bin/electron $out/bin/typora \
|
||||||
--add-flags $out/share/typora \
|
--add-flags $out/share/typora \
|
||||||
"''${gappsWrapperArgs[@]}" \
|
"''${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";
|
description = "A minimal Markdown reading & writing app";
|
||||||
homepage = https://typora.io;
|
homepage = https://typora.io;
|
||||||
license = licenses.unfree;
|
license = licenses.unfree;
|
||||||
|
|
Loading…
Reference in a new issue