Merge pull request #2185 from lethalman/gnome3
tracker, licenses.cc-by-30, gnome-user-docs, upgrade sushi, gnome-keyring service, gnome-user-share, gnome-tweak-tool, gnome-shell-extensions, xdg-user-dirs
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, glib, gdk_pixbuf }:
|
||||
{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool
|
||||
, glib, gdk_pixbuf, gobjectIntrospection, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
ver_maj = "0.7";
|
||||
@@ -9,23 +10,15 @@ stdenv.mkDerivation rec {
|
||||
url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz";
|
||||
sha256 = "0dyq8zgjnnzcah31axnx6afb21kl7bks1gvrg4hjh3nk02j1rxhf";
|
||||
};
|
||||
src_m4 = fetchurl {
|
||||
url = "mirror://gentoo/distfiles/introspection-20110205.m4.tar.bz2";
|
||||
sha256 = "1cnqh7aaji648nfd5537v7xaak8hgww3bpifhwam7bl0sc3ad523";
|
||||
};
|
||||
|
||||
# see Gentoo ebuild - we don't need to depend on gtk+(2/3)
|
||||
preConfigure = ''
|
||||
cd m4
|
||||
tar xvf ${src_m4}
|
||||
cd ..
|
||||
|
||||
preAutoreconf = ''
|
||||
sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
|
||||
sed -i -e '/PKG_CHECK_MODULES(TESTS/d' configure.ac || die
|
||||
AT_M4DIR=. autoreconf
|
||||
'';
|
||||
|
||||
buildInputs = [ pkgconfig automake autoconf glib gdk_pixbuf ];
|
||||
buildInputs = [ pkgconfig automake autoconf autoreconfHook
|
||||
libtool glib gdk_pixbuf gobjectIntrospection ];
|
||||
|
||||
meta = {
|
||||
homepage = http://galago-project.org/; # very obsolete but found no better
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
, gobjectIntrospection, valaSupport ? true, vala }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "telepathy-glib-0.22.1";
|
||||
name = "telepathy-glib-0.24.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
|
||||
sha256 = "0vf2drh7g55nxyd0mxyn9sf99m981dagnvv9yc3q9f4k8x092a78";
|
||||
sha256 = "ae0002134991217f42e503c43dea7817853afc18863b913744d51ffa029818cf";
|
||||
};
|
||||
|
||||
configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings";
|
||||
|
||||
Reference in New Issue
Block a user