cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #208374 from atorres1985-contrib/ventoy

Browse source 
ventoy-bin: remove `inherit (libsForQt5)` reference on all-packages.nix
This commit is contained in:
Anderson Torres 2022-12-30 17:07:17 -03:00 committed by GitHub
commit 5f8f8426dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/cd-dvd/ventoy-bin/default.nix
View file

@ -20,10 +20,8 @@
, ntfs3g , ntfs3g
, parted , parted
, procps , procps
, qtbase
, util-linux , util-linux
, which , which
, wrapQtAppsHook
, xfsprogs , xfsprogs
, xz , xz
, defaultGuiType ? "" , defaultGuiType ? ""
@ -33,6 +31,7 @@
, withNtfs ? false , withNtfs ? false
, withGtk3 ? false , withGtk3 ? false
, withQt5 ? false , withQt5 ? false
, libsForQt5
}: }:
assert lib.elem defaultGuiType [ "" "gtk3" "qt5" ]; assert lib.elem defaultGuiType [ "" "gtk3" "qt5" ];
@ -40,6 +39,8 @@ assert defaultGuiType == "gtk3" -> withGtk3;
assert defaultGuiType == "qt5" -> withQt5; assert defaultGuiType == "qt5" -> withQt5;
let let
inherit (lib) optional optionalString;
inherit (libsForQt5) qtbase wrapQtAppsHook;
arch = { arch = {
x86_64-linux = "x86_64"; x86_64-linux = "x86_64";
i686-linux = "i386"; i686-linux = "i386";
@ -47,7 +48,6 @@ let
mipsel-linux = "mips64el"; mipsel-linux = "mips64el";
}.${stdenv.hostPlatform.system} }.${stdenv.hostPlatform.system}
or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
inherit (lib) optional optionalString;
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "ventoy-bin"; pname = "ventoy-bin";

4
pkgs/top-level/all-packages.nix
View file

@ -1489,9 +1489,7 @@ with pkgs;
veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { };
ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { };
inherit (libsForQt5) qtbase wrapQtAppsHook;
};
ventoy-bin-full = ventoy-bin.override { ventoy-bin-full = ventoy-bin.override {
withCryptsetup = true; withCryptsetup = true;
withXfs = true; withXfs = true;