public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

epiphany: add 3.12.1 version and cleanup expr

Browse Source
This commit is contained in:
Luca Bruno 2014-05-18 23:57:11 +02:00
parent d38e915e22
commit e2879bdc63
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
View File

@ -1,43 +1,46 @@
{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit , webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
, sqlite, gcr, avahi, nss, isocodes, itstool, file , sqlite, gcr, avahi, nss, isocodes, itstool, file, which
, hicolor_icon_theme, gdk_pixbuf, librsvg }: , hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "epiphany-3.10.3"; name = "epiphany-3.12.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/epiphany/3.10/${name}.tar.xz"; url = "mirror://gnome/sources/epiphany/3.12/${name}.tar.xz";
sha256 = "c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7"; sha256 = "16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93";
}; };
# Tests need an X display # Tests need an X display
configureFlags = [ "--disable-static --disable-tests" ]; configureFlags = [ "--disable-static --disable-tests" ];
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
nativeBuildInputs = [ pkgconfig file ]; nativeBuildInputs = [ pkgconfig file ];
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; configureScript = "./autogen.sh";
buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file
webkitgtk libsoup libsecret gnome_desktop libnotify libtool webkitgtk libsoup libsecret gnome_desktop libnotify libtool
sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
gdk_pixbuf gnome3.gnome_icon_theme librsvg which gnome_common
hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
enableParallelBuilding = true; enableParallelBuilding = true;
preFixup = '' preFixup = ''
wrapProgram "$out/bin/epiphany" \ wrapProgram "$out/bin/epiphany" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
''; '';
patches = [ ./libxml_missing_dep.patch ];
patchFlags = "-p0";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Epiphany; homepage = https://wiki.gnome.org/Apps/Epiphany;
description = "WebKit based web browser for GNOME"; description = "WebKit based web browser for GNOME";

10
pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch Normal file
View File

@ -0,0 +1,10 @@
--- configure.ac.orig 2014-05-19 13:28:28.493988695 +0200
+++ configure.ac 2014-05-19 13:28:54.837159748 +0200
@@ -115,6 +115,7 @@
PKG_CHECK_MODULES(WEB_EXTENSION, [
$WEBKIT_GTK_PC_NAME >= $WEBKIT_GTK_REQUIRED
+ libxml-2.0 >= $LIBXML_REQUIRED
libsecret-1 >= $LIBSECRET_REQUIRED
])
AC_SUBST(WEB_EXTENSION_CFLAGS)