summary refs log tree commit diff
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-07 15:31:31 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-01-07 15:31:31 +0000
commit50dab9837383cc5912f881fa856b3e21a44c21a5 (patch)
tree5a1ecb2106cc1bae3ca5e5e94efa1ec73101a1f5
parentb81dda6f0a18618055b36b12a9eba8899b214114 (diff)
downloadnixpkgs-50dab9837383cc5912f881fa856b3e21a44c21a5.tar
nixpkgs-50dab9837383cc5912f881fa856b3e21a44c21a5.tar.gz
nixpkgs-50dab9837383cc5912f881fa856b3e21a44c21a5.tar.bz2
nixpkgs-50dab9837383cc5912f881fa856b3e21a44c21a5.tar.lz
nixpkgs-50dab9837383cc5912f881fa856b3e21a44c21a5.tar.xz
nixpkgs-50dab9837383cc5912f881fa856b3e21a44c21a5.tar.zst
nixpkgs-50dab9837383cc5912f881fa856b3e21a44c21a5.zip
gnome2.gnome_vfs: disable HAL, enable ACL
svn path=/nixpkgs/trunk/; revision=31403
-rw-r--r--pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix7
1 files 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 c141da4324d..0215b341f93 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 ];
 }