public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

typora: fix gsettings error (#41125)

This commit is contained in:
worldofpeace 2018-05-28 09:55:17 +00:00 committed by xeji
parent 8714a30e4c
commit 0e97d71126
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/editors/typora/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gtk3, atk, cairo { stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo
, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev }: , freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "typora-${version}"; name = "typora-${version}";
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
gnome2.gtk gnome2.gtk
gnome2.gdk_pixbuf gnome2.gdk_pixbuf
gnome2.pango gnome2.pango
gnome3.defaultIconTheme
expat expat
gtk3 gtk3
atk atk
@ -51,6 +52,9 @@ stdenv.mkDerivation rec {
xorg.libXScrnSaver xorg.libXScrnSaver
]; ];
nativeBuildInputs = [ wrapGAppsHook ];
dontWrapGApps = true;
buildInputs = [ dpkg makeWrapper ]; buildInputs = [ dpkg makeWrapper ];
@ -72,7 +76,13 @@ stdenv.mkDerivation rec {
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/share/typora:${rpath}" "$out/share/typora/Typora" --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 # Fix the desktop link
substituteInPlace $out/share/applications/typora.desktop \ substituteInPlace $out/share/applications/typora.desktop \