forked from mirrors/nixpkgs
ventoy-bin: remove inherit (libsForQt5)
reference on all-packages.nix
According to the issue linked at the end, filling arguments for `callPackage` in all-packages.nix breaks splicing and makes the expressions incompatible with cross-compilation. This issue is more pronounced in the many `inherit (darwin)` calls. However, it is present in similar contexts too. The idea here is not the smartest: it just hides those inheritances from `all-packages.nix` and sends them to the `default.nix` expressions. Issue: https://github.com/NixOS/nixpkgs/issues/204303
This commit is contained in:
parent
5d6f451722
commit
1453e6761a
|
@ -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";
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue