about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-10-18 17:50:24 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-10-18 17:50:24 +0000
commit158a053a92626d9474a07227d5403308894af2cb (patch)
treee81f2462fecc0e783f487fa280b1b5ac04a346d7
parentc55c317e24cd9bfd551b68d99da2fed8c6fa9fed (diff)
downloadnixlib-158a053a92626d9474a07227d5403308894af2cb.tar
nixlib-158a053a92626d9474a07227d5403308894af2cb.tar.gz
nixlib-158a053a92626d9474a07227d5403308894af2cb.tar.bz2
nixlib-158a053a92626d9474a07227d5403308894af2cb.tar.lz
nixlib-158a053a92626d9474a07227d5403308894af2cb.tar.xz
nixlib-158a053a92626d9474a07227d5403308894af2cb.tar.zst
nixlib-158a053a92626d9474a07227d5403308894af2cb.zip
* HAL: make the shutdown/reboot messages work. Xfce needs this.
svn path=/nixpkgs/trunk/; revision=24350
-rw-r--r--pkgs/os-specific/linux/hal/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix
index 2f830ab0131a..6672b111d177 100644
--- a/pkgs/os-specific/linux/hal/default.nix
+++ b/pkgs/os-specific/linux/hal/default.nix
@@ -2,7 +2,7 @@
 , libusb, dbus, dbus_glib, glib, libuuid, perl
 , perlXMLParser, gettext, zlib, gperf, consolekit, policykit
 , libsmbios, dmidecode, udev, utillinuxng, pmutils, usbutils
-, eject
+, eject, upstart
 }:
 
 assert stdenv ? glibc;
@@ -49,7 +49,8 @@ stdenv.mkDerivation rec {
         --replace /bin/mount ${utillinuxng}/bin/mount \
         --replace /bin/umount ${utillinuxng}/bin/umount \
         --replace /usr/bin/pm-is-supported ${pmutils}/bin/pm-is-supported \
-        --replace /usr/sbin/pm ${pmutils}/sbin/pm
+        --replace /usr/sbin/pm ${pmutils}/sbin/pm \
+        --replace /sbin/shutdown ${upstart}/sbin/shutdown
     done
   '';