diff options
author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-03-30 21:44:58 -0400 |
---|---|---|
committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-03-30 21:44:58 -0400 |
commit | f54b4963cfece19d461c07952fdb27985a8efe12 (patch) | |
tree | ca4cd92c3c85b20b8475b7a902307c7094f63153 /pkgs/applications/editors/typora | |
parent | 7a8d8e9e7f883f3f640adac4d940558fb3d72316 (diff) | |
download | nixlib-f54b4963cfece19d461c07952fdb27985a8efe12.tar nixlib-f54b4963cfece19d461c07952fdb27985a8efe12.tar.gz nixlib-f54b4963cfece19d461c07952fdb27985a8efe12.tar.bz2 nixlib-f54b4963cfece19d461c07952fdb27985a8efe12.tar.lz nixlib-f54b4963cfece19d461c07952fdb27985a8efe12.tar.xz nixlib-f54b4963cfece19d461c07952fdb27985a8efe12.tar.zst nixlib-f54b4963cfece19d461c07952fdb27985a8efe12.zip |
typora: 0.9.64 -> 0.9.68
Make the wrapping happen in postFixup or else the wrapper is incomplete. That was noted in #56533 Closes https://github.com/NixOS/nixpkgs/pull/56533
Diffstat (limited to 'pkgs/applications/editors/typora')
-rw-r--r-- | pkgs/applications/editors/typora/default.nix | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index ebd7c77f678c..deb4974a9b14 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/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[@]}" \ @@ -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; }; } |