alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #19917 from grahamc/epiphany

Browse source 
Epiphany
This commit is contained in:
Graham Christensen 2016-10-27 12:09:48 -04:00 committed by GitHub
parent 84268a561a 3e18f4bc2f
commit 0425f7ab22
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix
View file

@ -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

6
pkgs/desktops/gnome-3/3.20/core/epiphany/src.nix
View file

@ -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";
};
}

6
pkgs/development/libraries/webkitgtk/2.14.nix
View file

@ -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"