From 0db2caa183104fe4102a2c01915b75bca45d48c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:35 +0000 Subject: pkgs/desktops/gnome-2.28/platform/gnome-vfs: don't require hal unless the host OS is Linux svn path=/nixpkgs/trunk/; revision=21859 --- pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix index 4772e2ded9e7..1e35ac9430bd 100644 --- a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix @@ -3,16 +3,17 @@ stdenv.mkDerivation { name = "gnome-vfs-2.24.1"; - + src = fetchurl { url = mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.1.tar.bz2; sha256 = "1dmyr8nj77717r8dhwkixpar2yp8ld3r683gp222n59v61718ndw"; }; - + buildInputs = - [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia + [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia intltool gnome_mime_data - ]; + ] + ++ (if stdenv.isLinux then [hal] else []); propagatedBuildInputs = [ GConf glib ]; } -- cgit 1.4.1