Author: eelco
Date: Mon Jul 25 00:28:18 2011
New Revision: 27928
URL: https://svn.nixos.org/websvn/nix/?rev=27928&sc=1
Log:
* pm-utils updated to 1.4.1. Also put all runtime dependencies in its
$PATH (because upower is called by dbus which doesn't allow setting
the $PATH).
Modified:
nixpkgs/branches/kde-4.7/pkgs/os-specific/linux/pm-utils/default.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/os-specific/linux/pm-utils/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/os-specific/linux/pm-utils/default.nix
Sun Jul 24 23:44:15 2011 (r27927)
+++ nixpkgs/branches/kde-4.7/pkgs/os-specific/linux/pm-utils/default.nix
Mon Jul 25 00:28:18 2011 (r27928)
@@ -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 {
- name = "pm-utils-1.3.0";
+ name = "pm-utils-1.4.1";
src = fetchurl {
url = "http://pm-utils.freedesktop.org/releases/${name}.tar.gz";;
- md5 = "37d71f8adbb409442212a85a080d324d";
+ sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f";
};
configureFlags = "--sysconfdir=/etc";
@@ -15,9 +26,11 @@
# Install the manpages (xmlto isn't really needed).
substituteInPlace man/Makefile.in --replace '@HAVE_XMLTO_TRUE@' ""
- # Don't screw up the PATH.
- substituteInPlace pm/pm-functions.in --replace
'/sbin:/usr/sbin:/bin:/usr/bin' '$PATH'
+ # Set the PATH properly.
+ 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)"
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
