Merge branch 'master'

This commit is contained in:
Vladimír Čunát
2018-03-05 14:53:27 +01:00
1666 changed files with 26733 additions and 31238 deletions
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeDesktopItem
, pkgconfig, autoconf213, alsaLib, bzip2, cairo
, dbus, dbus_glib, file, fontconfig, freetype
, dbus, dbus-glib, file, fontconfig, freetype
, gstreamer, gst-plugins-base, gst_all_1
, gtk2, hunspell, icu, libevent, libjpeg, libnotify
, libstartup_notification, libvpx, makeWrapper, libGLU_combined
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype
alsaLib bzip2 cairo dbus dbus-glib file fontconfig freetype
gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2
hunspell icu libevent libjpeg libnotify libstartup_notification
libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python