Author: viric
Date: Fri Nov 26 14:34:29 2010
New Revision: 24874
URL: https://svn.nixos.org/websvn/nix/?rev=24874&sc=1
Log:
Making halt and shutdown work fine in sysvinit (they had hardcoded /sbin, and
now I hardcode $out/sbin)
I also remove a patch I don't know what was it for.
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/sysvinit/sysvinit-2.85-exec.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/sysvinit/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/sysvinit/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/sysvinit/default.nix
Fri Nov 26 14:33:30 2010 (r24873)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/sysvinit/default.nix
Fri Nov 26 14:34:29 2010 (r24874)
@@ -10,7 +10,10 @@
sha256 = "068mvzaz808a673zigyaqb63xc8bndh2klk16zi5c83rw70wifv0";
};
- patches = [ ./sysvinit-2.85-exec.patch ];
+ prePatch = ''
+ # Patch some minimal hard references, so halt/shutdown work
+ sed -i -e 's,/sbin/,$out/sbin/,' src/halt.c src/init.c src/paths.h
+ '';
makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
