Merge remote-tracking branch 'origin/master' into stdenv-updates

This commit is contained in:
Eelco Dolstra
2013-02-15 13:36:34 +01:00
302 changed files with 14276 additions and 4226 deletions

View File

@@ -7,11 +7,11 @@ assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != n
&& glib != null;
stdenv.mkDerivation rec {
name = "libgsf-1.14.23";
name = "libgsf-1.14.25";
src = fetchurl {
url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
sha256 = "05zvaazf0d584nfirwsz7889lbsl4v781hslv3kda6akiwbwdhdz";
sha256 = "127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2";
};
nativeBuildInputs = [ intltool pkgconfig ];
@@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
doCheck = true;
patches = [ ./syscall-name-clash.patch ];
meta = {
homepage = http://www.gnome.org/projects/libgsf;
license = "LGPLv2";