571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
27 lines
890 B
Diff
27 lines
890 B
Diff
diff --git a/src/dav_fuse.c b/src/dav_fuse.c
|
|
index 6311428..1b1698d 100644
|
|
--- a/src/dav_fuse.c
|
|
+++ b/src/dav_fuse.c
|
|
@@ -189,7 +189,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time,
|
|
pid_t pid = fork();
|
|
if (pid == 0) {
|
|
#if defined(__linux__)
|
|
- execl("/bin/umount", "umount", "-il", mountpoint, NULL);
|
|
+ execl("@wrapperDir@/umount", "umount", "-il", mountpoint, NULL);
|
|
#elif defined(__FreeBSD__)
|
|
execl("/sbin/umount", "umount", "-v", mountpoint, NULL);
|
|
#endif
|
|
diff --git a/src/umount_davfs.c b/src/umount_davfs.c
|
|
index 6a82fd2..93958be 100644
|
|
--- a/src/umount_davfs.c
|
|
+++ b/src/umount_davfs.c
|
|
@@ -50,7 +50,7 @@
|
|
#endif
|
|
|
|
#if defined(__linux__)
|
|
-#define UMOUNT_CMD "umount -i"
|
|
+#define UMOUNT_CMD "@wrapperDir@/umount -i"
|
|
#elif defined(__FreeBSD__)
|
|
#define UMOUNT_CMD "umount"
|
|
#endif
|