public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* pm-utils updated to 1.4.1. Also put all runtime dependencies in its

Browse Source 
$PATH (because upower is called by dbus which doesn't allow setting
  the $PATH).

svn path=/nixpkgs/branches/kde-4.7/; revision=27928
This commit is contained in:
Eelco Dolstra 2011-07-25 00:28:18 +00:00
parent 174886639c
commit 93f36bf9ce
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/os-specific/linux/pm-utils/default.nix
View File

@ -1,11 +1,22 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, coreutils, gnugrep, utillinux, module_init_tools
, procps, kbd }:
let
binPath = stdenv.lib.makeSearchPath "bin"
[ coreutils gnugrep utillinux module_init_tools procps kbd ];
sbinPath = stdenv.lib.makeSearchPath "sbin"
[ procps ];
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pm-utils-1.3.0"; name = "pm-utils-1.4.1";
src = fetchurl { src = fetchurl {
url = "http://pm-utils.freedesktop.org/releases/${name}.tar.gz"; url = "http://pm-utils.freedesktop.org/releases/${name}.tar.gz";
md5 = "37d71f8adbb409442212a85a080d324d"; sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f";
}; };
configureFlags = "--sysconfdir=/etc"; configureFlags = "--sysconfdir=/etc";
@ -15,9 +26,11 @@ stdenv.mkDerivation rec {
# Install the manpages (xmlto isn't really needed). # Install the manpages (xmlto isn't really needed).
substituteInPlace man/Makefile.in --replace '@HAVE_XMLTO_TRUE@' "" substituteInPlace man/Makefile.in --replace '@HAVE_XMLTO_TRUE@' ""
# Don't screw up the PATH. # Set the PATH properly.
substituteInPlace pm/pm-functions.in --replace '/sbin:/usr/sbin:/bin:/usr/bin' '$PATH' substituteInPlace pm/pm-functions.in --replace '/sbin:/usr/sbin:/bin:/usr/bin' '$PATH:${binPath}:${sbinPath}'
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/00logging --replace /bin/uname "$(type -P uname)"
''; '';