about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2010-05-19 12:25:35 +0000
committerPeter Simons <simons@cryp.to>2010-05-19 12:25:35 +0000
commit0db2caa183104fe4102a2c01915b75bca45d48c9 (patch)
tree109809e3f22976c7d2e1a15019876f23370f5f73
parent6d7f97bd0b1628ed76a40c038ae70a9d91bd2ca1 (diff)
downloadnixlib-0db2caa183104fe4102a2c01915b75bca45d48c9.tar
nixlib-0db2caa183104fe4102a2c01915b75bca45d48c9.tar.gz
nixlib-0db2caa183104fe4102a2c01915b75bca45d48c9.tar.bz2
nixlib-0db2caa183104fe4102a2c01915b75bca45d48c9.tar.lz
nixlib-0db2caa183104fe4102a2c01915b75bca45d48c9.tar.xz
nixlib-0db2caa183104fe4102a2c01915b75bca45d48c9.tar.zst
nixlib-0db2caa183104fe4102a2c01915b75bca45d48c9.zip
pkgs/desktops/gnome-2.28/platform/gnome-vfs: don't require hal unless the host OS is Linux
svn path=/nixpkgs/trunk/; revision=21859
-rw-r--r--pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix9
1 files 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 ];
 }