diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-10-27 12:09:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-27 12:09:48 -0400 |
| commit | 0425f7ab22c61dd4aede92b05297072b392cdd24 (patch) | |
| tree | a580dadb062bd590c4a8ad0e226e77ba244f12e4 | |
| parent | 84268a561a1a84109ab28ce93a4ab4431816e657 (diff) | |
| parent | 3e18f4bc2f7d9dc89672a62fc07b071f6f32bcdd (diff) | |
| download | nixpkgs-0425f7ab22c61dd4aede92b05297072b392cdd24.tar nixpkgs-0425f7ab22c61dd4aede92b05297072b392cdd24.tar.gz nixpkgs-0425f7ab22c61dd4aede92b05297072b392cdd24.tar.bz2 nixpkgs-0425f7ab22c61dd4aede92b05297072b392cdd24.tar.lz nixpkgs-0425f7ab22c61dd4aede92b05297072b392cdd24.tar.xz nixpkgs-0425f7ab22c61dd4aede92b05297072b392cdd24.tar.zst nixpkgs-0425f7ab22c61dd4aede92b05297072b392cdd24.zip | |
Merge pull request #19917 from grahamc/epiphany
Epiphany
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/2.14.nix | 6 |
3 files changed, 9 insertions, 9 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 13efcd61392..cc31c7e7b97 100644 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit +, webkitgtk214x, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which , gdk_pixbuf, librsvg, gnome_common }: @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file - webkitgtk libsoup libsecret gnome_desktop libnotify libtool + buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file + webkitgtk214x libsoup libsecret gnome_desktop libnotify libtool 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 diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix index 457814913d6..84c94b45a59 100644 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "epiphany-3.20.3"; + name = "epiphany-3.20.4"; src = fetchurl { - url = mirror://gnome/sources/epiphany/3.20/epiphany-3.20.3.tar.xz; - sha256 = "4d9de1bdb44c14adf25aa6dc02ea3de60925cff5eb01fe89545e6032c9b424a2"; + url = mirror://gnome/sources/epiphany/3.20/epiphany-3.20.4.tar.xz; + sha256 = "051av2xcg7ii2y273vqmdkzanygws9qsaq7ks0070y06d4rhl6xy"; }; } diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix index 7439d72151d..ca74f384ec9 100644 --- a/pkgs/development/libraries/webkitgtk/2.14.nix +++ b/pkgs/development/libraries/webkitgtk/2.14.nix @@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.14.0"; + version = "2.14.1"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "02paj0anbnqn1z3hn5c4csmq9nga995rzagiplj3sjk2dj1ss4q5"; + sha256 = "1dffnz20psgc604azhbzn9a6cdhafar9dw74w3bbwrfy531pcb9f"; }; # see if we can clean this up.... patches = [ ./finding-harfbuzz-icu.patch ]; - cmakeFlags = [ + cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" "-DENABLE_GLES2=ON" |