Fix gvfs build

http://hydra.nixos.org/build/3156351
This commit is contained in:
Eelco Dolstra 2012-10-15 12:13:39 -04:00
parent 80fa05f1f5
commit 1d8e80f1b9
2 changed files with 18 additions and 12 deletions

View file

@ -1,19 +1,21 @@
{ stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2
, libcdio, libxml2, libtool, glib, intltool, GConf, libgnome_keyring, libsoup
, udev, avahi}:
, udev, avahi, libxslt, docbook_xsl }:
stdenv.mkDerivation {
name = "gvfs-1.10.1";
stdenv.mkDerivation rec {
name = "gvfs-1.14.1";
src = fetchurl {
url = mirror://gnome/sources/gvfs/1.10/gvfs-1.10.1.tar.xz;
sha256 = "124jrkph3cqr2pijmzzr6qwzy2vaq3vvndskzkxd0v5dwp7glc6d";
url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a";
};
buildInputs =
[ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 GConf
libgnome_keyring libsoup avahi libtool
libgnome_keyring libsoup avahi libtool libxslt docbook_xsl
];
buildNativeInputs = [ pkgconfig intltool ];
enableParallelBuilding = true;
}

View file

@ -1,14 +1,18 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse }:
{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse
, libxml2, libxslt, docbook_xsl, libgphoto2, libtool }:
stdenv.mkDerivation rec {
name = "gvfs-1.8.2";
name = "gvfs-1.14.1";
src = fetchurl {
url = "mirror://gnome/sources/gvfs/1.8/${name}.tar.bz2";
sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345";
url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz";
sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a";
};
buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu fuse ];
buildInputs =
[ pkgconfig glib dbus.libs intltool udev libgdu fuse libxml2 libxslt
docbook_xsl libgphoto2 libtool
];
meta = {
description = "Virtual Filesystem support library (for Xfce)";