diff options
author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-01-28 17:13:37 -0500 |
---|---|---|
committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-01-31 21:42:27 +0000 |
commit | 3b61faf52b9af2435d5aea9a57380ea8dcf033de (patch) | |
tree | 4543abbd890f2f838da9833db2072b13ba9da808 /pkgs/applications/editors/typora | |
parent | c0d3182f79101ab28ac67d7f39ef62f7b101786c (diff) | |
download | nixlib-3b61faf52b9af2435d5aea9a57380ea8dcf033de.tar nixlib-3b61faf52b9af2435d5aea9a57380ea8dcf033de.tar.gz nixlib-3b61faf52b9af2435d5aea9a57380ea8dcf033de.tar.bz2 nixlib-3b61faf52b9af2435d5aea9a57380ea8dcf033de.tar.lz nixlib-3b61faf52b9af2435d5aea9a57380ea8dcf033de.tar.xz nixlib-3b61faf52b9af2435d5aea9a57380ea8dcf033de.tar.zst nixlib-3b61faf52b9af2435d5aea9a57380ea8dcf033de.zip |
typora: 0.9.53 -> 0.9.64, remove electron blob
Also dropped the i386 archive.
Diffstat (limited to 'pkgs/applications/editors/typora')
-rw-r--r-- | pkgs/applications/editors/typora/default.nix | 104 |
1 files changed, 24 insertions, 80 deletions
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 0bff4864c612..ebd7c77f678c 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -1,92 +1,36 @@ -{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo, pango -, gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }: +{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "typora-${version}"; - version = "0.9.53"; + pname = "typora"; + version = "0.9.64"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "02k6x30l4mbjragqbq5rn663xbw3h4bxzgppfxqf5lwydswldklb"; - } - else - fetchurl { - url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "1wyq1ri0wwdy7slbd9dwyrdynsaa644x44c815jl787sg4nhas6y"; - } - ; + src = fetchurl { + url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; + sha256 = "0dffydc11ys2i38gdy8080ph1xlbbzhcdcc06hyfv0dr0nf58a09"; + }; - rpath = stdenv.lib.makeLibraryPath [ - alsaLib - gnome2.GConf - gdk_pixbuf - pango - gnome3.defaultIconTheme - expat - gtk3 - atk - nspr - nss - stdenv.cc.cc - glib - cairo - cups - dbus - udev - fontconfig - freetype - xorg.libX11 - xorg.libXi - xorg.libXext - xorg.libXtst - xorg.libXfixes - xorg.libXcursor - xorg.libXdamage - xorg.libXrender - xorg.libXrandr - xorg.libXcomposite - xorg.libxcb - xorg.libXScrnSaver - ]; + nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; - nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ]; - dontWrapGApps = true; + unpackPhase = "dpkg-deb -x $src ."; - buildInputs = [ dpkg makeWrapper ]; + dontWrapGApps = true; - unpackPhase = "true"; installPhase = '' - mkdir -p $out - dpkg -x $src $out - mv $out/usr/bin $out - mv $out/usr/share $out - rm $out/bin/typora - rmdir $out/usr - - # Otherwise it looks "suspicious" - chmod -R g-w $out - ''; - - postFixup = '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/share/typora:${rpath}" "$out/share/typora/Typora" - - makeWrapper $out/share/typora/Typora $out/bin/typora - - wrapProgram $out/bin/typora \ + mkdir -p $out/bin $out/share/typora + { + 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 + } + + makeWrapper ${electron_3}/bin/electron $out/bin/typora \ + --add-flags $out/share/typora \ "''${gappsWrapperArgs[@]}" \ - --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share" - - # Fix the desktop link - substituteInPlace $out/share/applications/typora.desktop \ - --replace /usr/bin/ $out/bin/ \ - --replace /usr/share/ $out/share/ - + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; meta = with stdenv.lib; { @@ -94,6 +38,6 @@ stdenv.mkDerivation rec { homepage = https://typora.io; license = licenses.unfree; maintainers = with maintainers; [ jensbin ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + inherit (electron_3.meta) platforms; }; } |