mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 08:53:21 +00:00
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.
28 lines
603 B
Diff
28 lines
603 B
Diff
--- a/src/firejail/fs_overlayfs.c
|
|
+++ b/src/firejail/fs_overlayfs.c
|
|
@@ -327,6 +327,16 @@
|
|
errExit("mounting /dev");
|
|
fs_logger("whitelist /dev");
|
|
|
|
+ // mount-bind /nix
|
|
+ if (arg_debug)
|
|
+ printf("Mounting /nix\n");
|
|
+ char *nix;
|
|
+ if (asprintf(&nix, "%s/nix", oroot) == -1)
|
|
+ errExit("asprintf");
|
|
+ if (mount("/nix", nix, NULL, MS_BIND|MS_REC, NULL) < 0)
|
|
+ errExit("mounting /nix");
|
|
+ fs_logger("whitelist /nix");
|
|
+
|
|
// mount-bind run directory
|
|
if (arg_debug)
|
|
printf("Mounting /run\n");
|
|
@@ -384,6 +394,7 @@
|
|
free(odiff);
|
|
free(owork);
|
|
free(dev);
|
|
+ free(nix);
|
|
free(run);
|
|
free(tmp);
|
|
}
|