diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index d136d95e6de7..e8f733ab5114 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -20,10 +20,8 @@ , ntfs3g , parted , procps -, qtbase , util-linux , which -, wrapQtAppsHook , xfsprogs , xz , defaultGuiType ? "" @@ -33,6 +31,7 @@ , withNtfs ? false , withGtk3 ? false , withQt5 ? false +, libsForQt5 }: assert lib.elem defaultGuiType [ "" "gtk3" "qt5" ]; @@ -40,6 +39,8 @@ assert defaultGuiType == "gtk3" -> withGtk3; assert defaultGuiType == "qt5" -> withQt5; let + inherit (lib) optional optionalString; + inherit (libsForQt5) qtbase wrapQtAppsHook; arch = { x86_64-linux = "x86_64"; i686-linux = "i386"; @@ -47,7 +48,6 @@ let mipsel-linux = "mips64el"; }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); - inherit (lib) optional optionalString; in stdenv.mkDerivation (finalAttrs: { pname = "ventoy-bin"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad8481cf406a..d88cc17c50af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1489,9 +1489,7 @@ with pkgs; veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; - ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { - inherit (libsForQt5) qtbase wrapQtAppsHook; - }; + ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { }; ventoy-bin-full = ventoy-bin.override { withCryptsetup = true; withXfs = true;