Merge pull request #13691 from AndersonTorres/cutegram

Cutegram: add qtimageformats (for sticker support)
This commit is contained in:
joachifm 2016-03-07 14:10:08 +00:00
commit 046e5011b4

View file

@ -1,5 +1,6 @@
{ stdenv, fetchgit { stdenv, fetchgit
, qtbase, qtmultimedia, qtquick1, qtquickcontrols, qtgraphicaleffects , qtbase, qtmultimedia, qtquick1, qtquickcontrols
, qtimageformats, qtgraphicaleffects
, telegram-qml, libqtelegram-aseman-edition , telegram-qml, libqtelegram-aseman-edition
, gst_plugins_base, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly , gst_plugins_base, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly
, makeQtWrapper }: , makeQtWrapper }:
@ -14,7 +15,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ qtbase qtmultimedia qtquick1 qtquickcontrols qtgraphicaleffects [ qtbase qtmultimedia qtquick1 qtquickcontrols
qtimageformats qtgraphicaleffects
telegram-qml libqtelegram-aseman-edition telegram-qml libqtelegram-aseman-edition
gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly ]; gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly ];
nativeBuildInputs = [ makeQtWrapper ]; nativeBuildInputs = [ makeQtWrapper ];
@ -33,5 +35,3 @@ stdenv.mkDerivation rec {
}; };
} }
#TODO: appindicator, for system tray plugin (by @profpatsch) #TODO: appindicator, for system tray plugin (by @profpatsch)