Commit 6222093e authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

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 8cf4ef7a.
parent 8cf4ef7a

pkgs/os-specific/linux/util-linux/default.nix

+0 −8
Original line number Diff line number Diff line
@@ -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";