From 4f8880a3e36dfb5883b43d76799bd2f7be7a3c63 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 14 Sep 2011 04:06:43 +0000 Subject: [PATCH] pmutils: PATH+=${dbus_tools}/bin, fix /sbin/hwclock sleep.d/55NetworkManager needs dbus-send svn path=/nixpkgs/trunk/; revision=29264 --- pkgs/os-specific/linux/pm-utils/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 56fa5eed1951..f20cadabc533 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, coreutils, gnugrep, utillinux, module_init_tools -, procps, kbd }: +, procps, kbd, dbus_tools }: let binPath = stdenv.lib.makeSearchPath "bin" - [ coreutils gnugrep utillinux module_init_tools procps kbd ]; + [ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ]; sbinPath = stdenv.lib.makeSearchPath "sbin" [ procps ]; @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { substituteInPlace src/pm-action.in --replace 'tr ' '${coreutils}/bin/tr ' substituteInPlace pm/sleep.d/00logging --replace /bin/uname "$(type -P uname)" + + substituteInPlace pm/sleep.d/90clock --replace /sbin/hwclock hwclock ''; meta = {