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

Re-Revert merge #5505: util-linux: use /run/current-system/sw/bin/*

Browse Source 
This reverts commit 6222093eecf1f314f82deafa3162c2ad923e66d3.
This commit is contained in:
Vladimír Čunát 2014-12-30 10:53:41 +01:00
parent 6222093eec
commit 88fd7f4527
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/util-linux/default.nix
View File

@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
sha256 = "e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6"; sha256 = "e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6";
}; };
#FIXME: make it also work on non-nixos?
postPatch = ''
# Substituting store paths would create a circular dependency on systemd
substituteInPlace include/pathnames.h \
--replace "/bin/login" "/run/current-system/sw/bin/login" \
--replace "/sbin/shutdown" "/run/current-system/sw/bin/shutdown"
'';
crossAttrs = { crossAttrs = {
# Work around use of `AC_RUN_IFELSE'. # Work around use of `AC_RUN_IFELSE'.
preConfigure = "export scanf_cv_type_modifier=ms"; preConfigure = "export scanf_cv_type_modifier=ms";