ecryptfs: fix after security wrapper change

The replacements matched to much due to wrapperDir having `/bin` in its path now. cc #16654
NixOS · Feb 16, 2017 · 790e5bf · 790e5bf
1 parent de31599
commit 790e5bf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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