From 790e5bf4d8aac5da407274350712b402b5d73c89 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 16 Feb 2017 11:31:30 +0100
Subject: [PATCH] ecryptfs: fix after security wrapper change

The replacements matched to much due to wrapperDir having `/bin` in its
path now.

cc #16654
---
 pkgs/tools/security/ecryptfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index ab4867a4cc81..f8ef409813cc 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
     for file in $FILES; do
       substituteInPlace "$file" \
+        --replace /bin/mount ${utillinux}/bin/mount \
+        --replace /bin/umount ${utillinux}/bin/umount \
         --replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \
         --replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \
         --replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \
@@ -26,8 +28,6 @@ stdenv.mkDerivation rec {
         --replace /usr/bin/ecryptfs-setup-private $out/bin/ecryptfs-setup-private \
         --replace /sbin/cryptsetup ${cryptsetup}/sbin/cryptsetup \
         --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \
-        --replace /bin/mount ${utillinux}/bin/mount \
-        --replace /bin/umount ${utillinux}/bin/umount \
         --replace /sbin/unix_chkpwd ${wrapperDir}/unix_chkpwd \
         --replace /bin/bash ${bash}/bin/bash
     done