diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-27 13:17:10 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-27 18:17:46 -0500 |
| commit | 49455d7bae2f81c5c984faa6728c9017123fa798 (patch) | |
| tree | 082b609e249a69c865c992f8c6f014d6cadbe7aa /pkgs/servers/interlock | |
| parent | 11f0e07d4fc3791a3318950bc70bc53b2828af6b (diff) | |
treewide: replace utillinux refs of {u,}mount
umount and mount are now provided top-level
Diffstat (limited to 'pkgs/servers/interlock')
| -rw-r--r-- | pkgs/servers/interlock/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index a0b59d332a3f..0df055f9690f 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup, - buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, sudo, coreutils, systemd, cryptsetup +, mount, umount +, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "interlock-${version}"; @@ -23,8 +24,8 @@ buildGoPackage rec { buildFlags = [ "-tags textsecure" ]; postPatch = '' grep -lr '/s\?bin/' | xargs sed -i \ - -e 's|/bin/mount|${utillinux}/bin/mount|' \ - -e 's|/bin/umount|${utillinux}/bin/umount|' \ + -e 's|/bin/mount|${mount}/bin/mount|' \ + -e 's|/bin/umount|${umount}/bin/umount|' \ -e 's|/bin/cp|${coreutils}/bin/cp|' \ -e 's|/bin/mv|${coreutils}/bin/mv|' \ -e 's|/bin/chown|${coreutils}/bin/chown|' \ |