diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:06:32 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:06:32 +0200 |
commit | 9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (patch) | |
tree | e521ba305aa4848b216a15e2eac0e69acdb0d1e9 /pkgs/applications/editors/typora/default.nix | |
parent | 9d0336a2bbe933c1a8e6ea7c7b39eb7ff071ef66 (diff) | |
parent | 12949bf84ab06bebb854a07082bf5c32f5e14892 (diff) | |
download | nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.gz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.bz2 nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.lz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.xz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.zst nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.zip |
Merge staging into staging-next
Diffstat (limited to 'pkgs/applications/editors/typora/default.nix')
-rw-r--r-- | pkgs/applications/editors/typora/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 082bc2a2536c..93ee70e4148b 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango +{ 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.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rpath = stdenv.lib.makeLibraryPath [ alsaLib - gnome3.gconf + gnome2.GConf gdk_pixbuf pango gnome3.defaultIconTheme |