diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-11-27 21:17:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-27 21:17:13 -0500 |
| commit | 8d6490bda1e4affcb782fe4138cd17ebc315d9f3 (patch) | |
| tree | 2bc94aa52eef949693d545eeee64696045cd2b7e /pkgs/desktops | |
| parent | 6d47cb41314a7acd220fdc83b6d173e130fb9155 (diff) | |
| parent | c04f1139607ac50f705a13f71aa1b68638b7a480 (diff) | |
Merge pull request #20732 from montag451/epiphany-html5-video
epiphany: enable the playing of HTML5 videos
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix index cc31c7e7b9753..e472014e38f69 100644 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix @@ -2,7 +2,7 @@ , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool , webkitgtk214x, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, gdk_pixbuf, librsvg, gnome_common }: +, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf - gnome3.glib_networking ]; + gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav]; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix index 9d36648d5cdc8..015f8213b4438 100644 --- a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix @@ -2,7 +2,7 @@ , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, gdk_pixbuf, librsvg, gnome_common }: +, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf - gnome3.glib_networking ]; + gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav]; NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; |