From 50dab9837383cc5912f881fa856b3e21a44c21a5 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 7 Jan 2012 15:31:31 +0000 Subject: [PATCH] gnome2.gnome_vfs: disable HAL, enable ACL svn path=/nixpkgs/trunk/; revision=31403 --- pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index c141da4324df..0215b341f934 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl_gnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib -, glib, fam, hal, cdparanoia, intltool, GConf, gnome_mime_data}: +, glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { name = src.pkgname; @@ -12,9 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia - intltool gnome_mime_data - ] - ++ (if stdenv.isLinux then [hal] else []); + intltool gnome_mime_data avahi acl + ]; propagatedBuildInputs = [ GConf glib ]; }