diff options
author | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-12-30 12:39:47 -0300 |
---|---|---|
committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-12-30 12:42:50 -0300 |
commit | 1453e6761a27d95235b3a235025a990f928e9241 (patch) | |
tree | aea616ae605f219defb80f3d1345ac32c337138a /pkgs/tools/cd-dvd | |
parent | 5d6f45172279af8822d44a4d748de3e3704a770b (diff) |
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
Diffstat (limited to 'pkgs/tools/cd-dvd')
-rw-r--r-- | pkgs/tools/cd-dvd/ventoy-bin/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index d136d95e6de78..e8f733ab51140 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"; |