Adapting everything for the merged permissions wrappers work.

2016-09-01 19:21:06 -05:00
parent 390ab0b3ef
commit 98c058a1ee
55 changed files with 162 additions and 131 deletions
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
      # Ensure that FUSE calls the setuid wrapper, not
      # $out/bin/fusermount. It falls back to calling fusermount in
      # $PATH, so it should also work on non-NixOS systems.
-      export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/setuid-wrappers\""
+      export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/permissions-wrappers\""

      sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
    '';