diff options
| author | Edmund Wu <fangkazuto@gmail.com> | 2019-09-19 21:18:25 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-21 12:08:54 -0400 |
| commit | 55ebe584622a40aae43b51eb1123178ddea2a090 (patch) | |
| tree | 1dfac10bdc0e000160ab5fe96653807fc20ce9f8 /pkgs/applications/editors | |
| parent | 889537352b5e208017dad66dd51b3923b7f2d23f (diff) | |
| download | nixlib-55ebe584622a40aae43b51eb1123178ddea2a090.tar nixlib-55ebe584622a40aae43b51eb1123178ddea2a090.tar.gz nixlib-55ebe584622a40aae43b51eb1123178ddea2a090.tar.bz2 nixlib-55ebe584622a40aae43b51eb1123178ddea2a090.tar.lz nixlib-55ebe584622a40aae43b51eb1123178ddea2a090.tar.xz nixlib-55ebe584622a40aae43b51eb1123178ddea2a090.tar.zst nixlib-55ebe584622a40aae43b51eb1123178ddea2a090.zip | |
typora: allow pandoc to be in PATH
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/typora/default.nix | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 7273b7252ca7..09baf383f972 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -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; |