Merge pull request #20732 from montag451/epiphany-html5-video

epiphany: enable the playing of HTML5 videos

authored by Graham Christensen and committed by GitHub 8d6490bd 6d47cb41

+8 -4
+4 -2
pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
··· 2 2 , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool 3 3 , webkitgtk214x, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit 4 4 , sqlite, gcr, avahi, nss, isocodes, itstool, file, which 5 - , gdk_pixbuf, librsvg, gnome_common }: 5 + , gdk_pixbuf, librsvg, gnome_common, gst_all_1 }: 6 6 7 7 stdenv.mkDerivation rec { 8 8 inherit (import ./src.nix fetchurl) name src; ··· 19 19 sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools 20 20 gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common 21 21 gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf 22 - gnome3.glib_networking ]; 22 + gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base 23 + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly 24 + gst_all_1.gst-libav]; 23 25 24 26 NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; 25 27
+4 -2
pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
··· 2 2 , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool 3 3 , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit 4 4 , sqlite, gcr, avahi, nss, isocodes, itstool, file, which 5 - , gdk_pixbuf, librsvg, gnome_common }: 5 + , gdk_pixbuf, librsvg, gnome_common, gst_all_1 }: 6 6 7 7 stdenv.mkDerivation rec { 8 8 inherit (import ./src.nix fetchurl) name src; ··· 19 19 sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools 20 20 gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common 21 21 gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf 22 - gnome3.glib_networking ]; 22 + gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base 23 + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly 24 + gst_all_1.gst-libav]; 23 25 24 26 NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; 25 27