Skip to content

Commit

Permalink
typora: 0.9.64 -> 0.9.68
Browse files Browse the repository at this point in the history
Make the wrapping happen in postFixup
or else the wrapper is incomplete.
That was noted in #56533

Closes #56533

(cherry picked from commit f54b496)
Fixes crash on in certain places due to an incomplete wrapper.
  • Loading branch information
worldofpeace committed Mar 31, 2019
1 parent 7e39a96 commit 986561f
Showing 1 changed file with 23 additions and 11 deletions.
34 changes: 23 additions & 11 deletions pkgs/applications/editors/typora/default.nix
@@ -1,32 +1,44 @@
{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gnome3, wrapGAppsHook }:
{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }:

stdenv.mkDerivation rec {
pname = "typora";
version = "0.9.64";
version = "0.9.68";

src = fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
sha256 = "0dffydc11ys2i38gdy8080ph1xlbbzhcdcc06hyfv0dr0nf58a09";
sha256 = "09hkmnh9avzb7nc8i67vhbv6nc1v90kk88aq01mpmyibpdqp03zp";
};

nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];
nativeBuildInputs = [
dpkg
makeWrapper
wrapGAppsHook
];

buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ];
buildInputs = [
glib
gsettings-desktop-schemas
gtk3
];

unpackPhase = "dpkg-deb -x $src .";

dontWrapGApps = true;

installPhase = ''
mkdir -p $out/bin $out/share/typora
runHook preInstall
mkdir -p $out/bin $out/share
{
cd usr
mv share/typora/resources/app/* $out/share/typora
mv share/applications $out/share
mv share/icons $out/share
mv share/doc $out/share
mv share/typora/resources/app $out/share/typora
mv share/{applications,icons,doc} $out/share/
}
runHook postInstall
'';

postFixup = ''
makeWrapper ${electron_3}/bin/electron $out/bin/typora \
--add-flags $out/share/typora \
"''${gappsWrapperArgs[@]}" \
Expand All @@ -37,7 +49,7 @@ stdenv.mkDerivation rec {
description = "A minimal Markdown reading & writing app";
homepage = https://typora.io;
license = licenses.unfree;
maintainers = with maintainers; [ jensbin ];
maintainers = with maintainers; [ jensbin worldofpeace ];
inherit (electron_3.meta) platforms;
};
}

0 comments on commit 986561f

Please sign in to comment.