mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 13:41:26 +00:00
Revert "merge #5505: use /run/current-system/sw/bin/*"
I didn't realize it causes a nontrivial rebuild (through systemd).
I'll re-push to staging.
This reverts commit 8cf4ef7ab7
.
This commit is contained in:
parent
8cf4ef7ab7
commit
6222093eec
|
@ -8,14 +8,6 @@ stdenv.mkDerivation rec {
|
|||
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 = {
|
||||
# Work around use of `AC_RUN_IFELSE'.
|
||||
preConfigure = "export scanf_cv_type_modifier=ms";
|
||||
|
|
Loading…
Reference in a new issue