mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 09:04:17 +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.
18 lines
720 B
Diff
18 lines
720 B
Diff
diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
|
|
index ddcc1511..546c2a36 100644
|
|
--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
|
|
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
|
|
@@ -555,9 +555,9 @@ add_bwrap (GPtrArray *array,
|
|
g_return_val_if_fail (script->s_infile != NULL, FALSE);
|
|
|
|
add_args (array,
|
|
- "bwrap",
|
|
- "--ro-bind", "/usr", "/usr",
|
|
- "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
|
|
+ "@bubblewrap_bin@",
|
|
+ "--ro-bind", "@storeDir@", "@storeDir@",
|
|
+ "--ro-bind-try", "/run/current-system", "/run/current-system",
|
|
NULL);
|
|
|
|
/* These directories might be symlinks into /usr/... */
|