From 6222093eecf1f314f82deafa3162c2ad923e66d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 30 Dec 2014 10:50:47 +0100 Subject: [PATCH] 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 8cf4ef7ab747b3e3d0b1319de538257281355b33. --- pkgs/os-specific/linux/util-linux/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 3715a93d932..3b76eb63ea5 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -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";