From 630e1fbb519211111401114e8d64b96ecbf76b69 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 12 Apr 2023 22:39:02 -0300
Subject: [PATCH] ventoy-bin: rename to ventoy

---
 .../000-nixos-sanitization.patch                      |  0
 pkgs/tools/cd-dvd/{ventoy-bin => ventoy}/default.nix  | 11 +++++------
 pkgs/top-level/all-packages.nix                       |  4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/tools/cd-dvd/{ventoy-bin => ventoy}/000-nixos-sanitization.patch (100%)
 rename pkgs/tools/cd-dvd/{ventoy-bin => ventoy}/default.nix (96%)

diff --git a/pkgs/tools/cd-dvd/ventoy-bin/000-nixos-sanitization.patch b/pkgs/tools/cd-dvd/ventoy/000-nixos-sanitization.patch
similarity index 100%
rename from pkgs/tools/cd-dvd/ventoy-bin/000-nixos-sanitization.patch
rename to pkgs/tools/cd-dvd/ventoy/000-nixos-sanitization.patch
diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy/default.nix
similarity index 96%
rename from pkgs/tools/cd-dvd/ventoy-bin/default.nix
rename to pkgs/tools/cd-dvd/ventoy/default.nix
index 3de0397d0634..21ba7391d3fa 100644
--- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix
+++ b/pkgs/tools/cd-dvd/ventoy/default.nix
@@ -50,7 +50,7 @@ let
     or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "ventoy-bin";
+  pname = "ventoy";
   version = "1.0.90";
 
   src = let
@@ -183,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.ventoy.net";
     description = "A New Bootable USB Solution";
     longDescription = ''
@@ -200,10 +200,9 @@ stdenv.mkDerivation (finalAttrs: {
       800+ image files are tested.  90%+ distros in DistroWatch supported.
     '';
     changelog = "https://www.ventoy.net/doc_news.html";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
     platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    mainProgram = "ventoy";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c72b87290063..8ad6bb2cca81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1670,8 +1670,8 @@ with pkgs;
 
   veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { };
 
-  ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { };
-  ventoy-bin-full = ventoy-bin.override {
+  ventoy = callPackage ../tools/cd-dvd/ventoy { };
+  ventoy-full = ventoy.override {
     withCryptsetup = true;
     withXfs = true;
     withExt4 = true;