mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 07:34:11 +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.
27 lines
931 B
Diff
27 lines
931 B
Diff
diff --git a/distrobox-generate-entry b/distrobox-generate-entry
|
|
index 65fcea0..8d57e4e 100755
|
|
--- a/distrobox-generate-entry
|
|
+++ b/distrobox-generate-entry
|
|
@@ -51,7 +51,7 @@ container_manager="autodetect"
|
|
container_name_default="my-distrobox"
|
|
delete=0
|
|
icon="auto"
|
|
-icon_default="${XDG_DATA_HOME:-${HOME}/.local/share}/icons/terminal-distrobox-icon.svg"
|
|
+icon_default="terminal-distrobox-icon"
|
|
verbose=0
|
|
online=0
|
|
version="1.8.0"
|
|
@@ -335,12 +335,6 @@ if [ "${icon}" = "auto" ]; then
|
|
|
|
icon_url="$(echo "${DISTRO_ICON_MAP}" | grep "${container_distro}:" | cut -d':' -f2-)"
|
|
|
|
- # Distro not found in our map, fallback to generic icon
|
|
- if [ -z "${icon_url}" ]; then
|
|
- icon_url="https://raw.githubusercontent.com/89luca89/distrobox/main/icons/terminal-distrobox-icon.svg"
|
|
- container_distro="terminal-distrobox-icon"
|
|
- fi
|
|
-
|
|
if [ -n "${icon_url}" ] && [ "${download}" != "null" ]; then
|
|
icon_extension="${icon_url##*.}"
|
|
|