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: 8714a30e4c9c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0e97d7112626
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 28, 2018

  1. typora: fix gsettings error (#41125)

    @worldofpeace @xeji
    worldofpeace authored and xeji committed May 28, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    samsonasik Abdul Malik Ikhsan
    GPG key ID: 69AC5BC354C89BE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0e97d71 View commit details
Showing with 13 additions and 3 deletions.
  1. +13 −3 pkgs/applications/editors/typora/default.nix
16 changes: 13 additions & 3 deletions pkgs/applications/editors/typora/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 \