diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-12-30 10:50:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-12-30 10:51:36 +0100 |
| commit | 6222093eecf1f314f82deafa3162c2ad923e66d3 (patch) | |
| tree | 8129e002083c30fcc9c9483b162407942459f2f8 /pkgs | |
| parent | 8cf4ef7ab747b3e3d0b1319de538257281355b33 (diff) | |
| download | nixlib-6222093eecf1f314f82deafa3162c2ad923e66d3.tar nixlib-6222093eecf1f314f82deafa3162c2ad923e66d3.tar.gz nixlib-6222093eecf1f314f82deafa3162c2ad923e66d3.tar.bz2 nixlib-6222093eecf1f314f82deafa3162c2ad923e66d3.tar.lz nixlib-6222093eecf1f314f82deafa3162c2ad923e66d3.tar.xz nixlib-6222093eecf1f314f82deafa3162c2ad923e66d3.tar.zst nixlib-6222093eecf1f314f82deafa3162c2ad923e66d3.zip | |
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 3715a93d9328..3b76eb63ea5f 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"; |