diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-08 08:11:01 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-08 08:11:01 +0100 |
| commit | 0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778 (patch) | |
| tree | 6f41b6c4ec4f9dd918fe596b8ac0683799ee277f /pkgs/os-specific/linux | |
| parent | 6b6f9d769a5086df38a06b680104d0c5fd1a8e0e (diff) | |
| parent | fed080b772e1d8679db383488cf2f80f0288c54b (diff) | |
| download | nixlib-0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778.tar nixlib-0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778.tar.gz nixlib-0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778.tar.bz2 nixlib-0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778.tar.lz nixlib-0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778.tar.xz nixlib-0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778.tar.zst nixlib-0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index c66b4cbab830..baaa90e431ba 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace include/pathnames.h \ --replace "/bin/login" "${shadow}/bin/login" substituteInPlace sys-utils/eject.c \ - --replace "/bin/umount" "$out/bin/umount" + --replace "/bin/umount" "$bin/bin/umount" ''; # !!! It would be better to obtain the path to the mount helpers |