From 0e97d7112626108b5def25bb18f0a8f4f9884b65 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 28 May 2018 09:55:17 +0000
Subject: [PATCH] typora: fix gsettings error (#41125)

---
 pkgs/applications/editors/typora/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index ed4aefd90bc..3513888f74f 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gtk3, atk, cairo
-, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev }:
+{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo
+, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "typora-${version}";
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
       gnome2.gtk
       gnome2.gdk_pixbuf
       gnome2.pango
+      gnome3.defaultIconTheme
       expat
       gtk3
       atk
@@ -51,6 +52,9 @@ stdenv.mkDerivation rec {
       xorg.libXScrnSaver
   ];
 
+  nativeBuildInputs = [ wrapGAppsHook ];
+
+  dontWrapGApps = true;
 
   buildInputs = [ dpkg makeWrapper ];
 
@@ -72,7 +76,13 @@ stdenv.mkDerivation rec {
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "$out/share/typora:${rpath}" "$out/share/typora/Typora"
 
-    ln -s "$out/share/typora/Typora" "$out/bin/typora"
+    makeWrapper $out/share/typora/Typora $out/bin/typora
+
+    wrapProgram $out/bin/typora \
+      "''${gappsWrapperArgs[@]}" \
+      --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
+      --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" \
+      --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share"
 
     # Fix the desktop link
     substituteInPlace $out/share/applications/typora.desktop \