diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
| commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
| tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/os-specific/linux/hal/default.nix | |
| parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
| parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
| download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip | |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/os-specific/linux/hal/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/hal/default.nix | 5 |
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 45a3efbfce53..718d54f3106e 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; @@ -54,7 +54,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 ''; |