pyrox.dev
Merge pull request #208374 from atorres1985-contrib/ventoy
ventoy-bin: remove `inherit (libsForQt5)` reference on all-packages.nix
authored by Anderson Torres and committed by GitHub 5f8f8426 e751f1eb
+3
-3
pkgs/tools/cd-dvd/ventoy-bin/default.nix
+3
-3
pkgs/tools/cd-dvd/ventoy-bin/default.nix
···
20
20
, ntfs3g
21
21
, parted
22
22
, procps
23
-
, qtbase
24
23
, util-linux
25
24
, which
26
-
, wrapQtAppsHook
27
25
, xfsprogs
28
26
, xz
29
27
, defaultGuiType ? ""
···
33
31
, withNtfs ? false
34
32
, withGtk3 ? false
35
33
, withQt5 ? false
34
+
, libsForQt5
36
35
}:
37
36
38
37
assert lib.elem defaultGuiType [ "" "gtk3" "qt5" ];
···
40
39
assert defaultGuiType == "qt5" -> withQt5;
41
40
42
41
let
42
+
inherit (lib) optional optionalString;
43
+
inherit (libsForQt5) qtbase wrapQtAppsHook;
43
44
arch = {
44
45
x86_64-linux = "x86_64";
45
46
i686-linux = "i386";
···
47
48
mipsel-linux = "mips64el";
48
49
}.${stdenv.hostPlatform.system}
49
50
or (throw "Unsupported platform ${stdenv.hostPlatform.system}");
50
-
inherit (lib) optional optionalString;
51
51
in
52
52
stdenv.mkDerivation (finalAttrs: {
53
53
pname = "ventoy-bin";
+1
-3
pkgs/top-level/all-packages.nix
+1
-3
pkgs/top-level/all-packages.nix
···
1489
1489
1490
1490
veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { };
1491
1491
1492
-
ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin {
1493
-
inherit (libsForQt5) qtbase wrapQtAppsHook;
1494
-
};
1492
+
ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { };
1495
1493
ventoy-bin-full = ventoy-bin.override {
1496
1494
withCryptsetup = true;
1497
1495
withXfs = true;