diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba8b2315727f..67e41855dac1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24627,7 +24627,7 @@ with pkgs; }); libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix { - inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope; + inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsBuildHost; }); # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index d675c86797db..6a1fe368f34a 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -10,11 +10,15 @@ , __splicedPackages , makeScopeWithSplicing' , generateSplicesForMkScope +, pkgsBuildHost }: let pkgs = __splicedPackages; - qt5 = __splicedPackages.qt5; + # qt5 set should not be pre-spliced to prevent spliced packages being a part of an unspliced set + # 'pkgsCross.aarch64-multiplatform.pkgsBuildTarget.targetPackages.libsForQt5.qtbase' should not have a `__spliced` but if qt5 is pre-spliced then it will have one. + # pkgsBuildHost == pkgs + qt5 = pkgsBuildHost.qt5; in makeScopeWithSplicing' {