Merge pull request #205050 from atorres1985-contrib/misc-updates

ventoy-bin: fix egregious error on meta attributes
This commit is contained in:
Anderson Torres 2022-12-07 21:50:57 -03:00 committed by GitHub
commit c339888dde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -120,11 +120,11 @@ stdenv.mkDerivation (finalAttrs: {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
# Setup variables. # Setup variables
local VENTOY_PATH="$out"/share/ventoy local VENTOY_PATH="$out"/share/ventoy
local ARCH='${arch}' local ARCH='${arch}'
# Prepare. # Prepare
cd tool/"$ARCH" cd tool/"$ARCH"
rm ash* hexdump* mkexfatfs* mount.exfat-fuse* xzcat* rm ash* hexdump* mkexfatfs* mount.exfat-fuse* xzcat*
for archive in *.xz; do for archive in *.xz; do
@ -144,11 +144,11 @@ stdenv.mkDerivation (finalAttrs: {
rm README rm README
rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true # For aarch64 and mips64el. rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true # For aarch64 and mips64el.
# Copy from "$src" to "$out". # Copy from "$src" to "$out"
mkdir -p "$out"/bin "$VENTOY_PATH" mkdir -p "$out"/bin "$VENTOY_PATH"
cp -r . "$VENTOY_PATH" cp -r . "$VENTOY_PATH"
# Fill bin dir. # Fill bin dir
for f in Ventoy2Disk.sh_ventoy VentoyWeb.sh_ventoy-web \ for f in Ventoy2Disk.sh_ventoy VentoyWeb.sh_ventoy-web \
CreatePersistentImg.sh_ventoy-persistent \ CreatePersistentImg.sh_ventoy-persistent \
ExtendPersistentImg.sh_ventoy-extend-persistent \ ExtendPersistentImg.sh_ventoy-extend-persistent \
@ -184,9 +184,9 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://www.ventoy.net";
description = "A New Bootable USB Solution"; description = "A New Bootable USB Solution";
longDescription = '' longDescription = ''
homepage = "https://www.ventoy.net";
Ventoy is an open source tool to create bootable USB drive for Ventoy is an open source tool to create bootable USB drive for
ISO/WIM/IMG/VHD(x)/EFI files. With ventoy, you don't need to format the ISO/WIM/IMG/VHD(x)/EFI files. With ventoy, you don't need to format the
disk over and over, you just need to copy the ISO/WIM/IMG/VHD(x)/EFI files disk over and over, you just need to copy the ISO/WIM/IMG/VHD(x)/EFI files