Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ea757ac59ff1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b641b4d29ebd
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 31, 2019

  1. 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 #56533
    @worldofpeace
    worldofpeace committed Mar 31, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    codetheweb Max Isom
    GPG key ID: C7631086E1E5F289
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f54b496 View commit details

  2. Merge pull request #58601 from worldofpeace/typora/0.9.68 

    typora: 0.9.64 -> 0.9.68
    @worldofpeace
    worldofpeace authored Mar 31, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    codetheweb Max Isom
    GPG key ID: C7631086E1E5F289
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b641b4d View commit details
Showing with 23 additions and 11 deletions.
  1. +23 −11 pkgs/applications/editors/typora/default.nix
34 changes: 23 additions & 11 deletions pkgs/applications/editors/typora/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}