diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-21 12:29:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-21 12:29:07 -0400 |
| commit | 19b4d18893c507ebb8c0dc90ce72ec59773f96e6 (patch) | |
| tree | 938e021d75a5336de0c6610456818a6a9b828e54 /pkgs | |
| parent | 9a9760d88e100e52154d9595681f9dd4303bb013 (diff) | |
| parent | 55ebe584622a40aae43b51eb1123178ddea2a090 (diff) | |
| download | nixpkgs-19b4d18893c507ebb8c0dc90ce72ec59773f96e6.tar nixpkgs-19b4d18893c507ebb8c0dc90ce72ec59773f96e6.tar.gz nixpkgs-19b4d18893c507ebb8c0dc90ce72ec59773f96e6.tar.bz2 nixpkgs-19b4d18893c507ebb8c0dc90ce72ec59773f96e6.tar.lz nixpkgs-19b4d18893c507ebb8c0dc90ce72ec59773f96e6.tar.xz nixpkgs-19b4d18893c507ebb8c0dc90ce72ec59773f96e6.tar.zst nixpkgs-19b4d18893c507ebb8c0dc90ce72ec59773f96e6.zip | |
Merge pull request #69129 from eadwu/typora/include-pandoc
typora: allow pandoc to be in PATH
Diffstat (limited to 'pkgs')
| -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 7273b7252ca..09baf383f97 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; |