From e93367dc45ed0c2d9ec72e0d0140d1fac48cea02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Aug 2009 02:04:26 +0000
Subject: [PATCH] * Enable auto-mounting/unmounting of optical media and USB
 sticks   (e.g. in KDE).

svn path=/nixpkgs/trunk/; revision=16745
---
 pkgs/os-specific/linux/hal/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix
index ab47ecdd83d8..7c538dfca5b3 100644
--- a/pkgs/os-specific/linux/hal/default.nix
+++ b/pkgs/os-specific/linux/hal/default.nix
@@ -31,11 +31,14 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \
-             hald/linux/coldplug.c hald/linux/blockdev.c
+             hald/linux/coldplug.c hald/linux/blockdev.c \
+             tools/hal-storage-mount.c ./tools/hal-storage-shared.c
     do
       substituteInPlace $i \
         --replace /usr/sbin/dmidecode ${dmidecode}/sbin/dmidecode \
-        --replace /sbin/udevadm ${udev}/sbin/udevadm
+        --replace /sbin/udevadm ${udev}/sbin/udevadm \
+        --replace /bin/mount ${utillinuxng}/bin/mount \
+        --replace /bin/umount ${utillinuxng}/bin/umount
     done
   '';
 }