Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6d47cb41314a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8d6490bda1e4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 26, 2016

  1. epiphany: enable the playing of HTML5 videos

    @montag451
    montag451 committed Nov 26, 2016
    Copy the full SHA
    c04f113 View commit details

Commits on Nov 28, 2016

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

    epiphany: enable the playing of HTML5 videos
    @grahamc
    grahamc authored Nov 28, 2016
    Copy the full SHA
    8d6490b View commit details
Showing with 8 additions and 4 deletions.
  1. +4 −2 pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
  2. +4 −2 pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
6 changes: 4 additions & 2 deletions pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";

6 changes: 4 additions & 2 deletions pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";