From d9d342749a9e24b2b10a46601bc0cfce56225531 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 2 Feb 2008 20:43:11 +0000
Subject: [PATCH] gnome-vfs: added hal, ssl and samba

svn path=/nixpkgs/branches/stdenv-updates/; revision=10468
---
 pkgs/desktops/gnome/default.nix   | 10 ++--------
 pkgs/desktops/gnome/gnome-vfs.nix |  7 ++-----
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index a3f8d4a9c052..014a99b674ae 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -1,12 +1,6 @@
 # todo audiofile is also part of the gnome platform. Move it to this collection?
 
-{ stdenv, fetchurl, pkgconfig, audiofile
-, flex, bison, popt, perl, zlib, libxml2, libxslt
-, perlXMLParser, docbook_xml_dtd_42, docbook_xml_dtd_412
-, gettext, x11, libtiff, libjpeg
-, libpng, gtkLibs, xlibs, bzip2, libcm, python, dbus_glib, ncurses
-, which, libxml2Python, iconnamingutils
-}:
+args: with args;
 
 assert dbus_glib.glib == gtkLibs.glib;
 
@@ -57,7 +51,7 @@ rec {
 
   gnomevfs = import ./gnome-vfs.nix {
     inherit fetchurl stdenv gnome pkgconfig perl libxml2 popt
-      perlXMLParser gettext bzip2 dbus_glib;
+      perlXMLParser gettext bzip2 dbus_glib openssl hal samba fam;
     input = platform.gnomevfs;
   };
 
diff --git a/pkgs/desktops/gnome/gnome-vfs.nix b/pkgs/desktops/gnome/gnome-vfs.nix
index b374ad4d94d5..24b99fb3b832 100644
--- a/pkgs/desktops/gnome/gnome-vfs.nix
+++ b/pkgs/desktops/gnome/gnome-vfs.nix
@@ -1,14 +1,11 @@
-{ input, stdenv, fetchurl, gnome, pkgconfig, perl, libxml2
-, popt, perlXMLParser, gettext, bzip2, dbus_glib
-}:
+args: with args;
 
 stdenv.mkDerivation {
   inherit (input) name src;
   buildInputs = [
     pkgconfig perl gnome.glib libxml2 gnome.GConf gnome.libbonobo
     gnome.gnomemimedata popt perlXMLParser gettext bzip2
-    dbus_glib
+    dbus_glib hal openssl samba fam
   ];
   patches = [./no-kerberos.patch];
-  configureFlags = "--disable-hal";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 110c8cf713d7..ddde745fe458 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4930,7 +4930,7 @@ rec {
             perl perlXMLParser docbook_xml_dtd_42 docbook_xml_dtd_412
             gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
             libcm python dbus_glib ncurses which libxml2Python
-            iconnamingutils;
+            iconnamingutils openssl hal samba fam;
   });
 
   kdelibs = import ../desktops/kde/kdelibs {