diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-14 18:01:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-14 18:01:11 +0000 |
| commit | 6cc772a6fa213f2624f490735f4cf49426bcc0e0 (patch) | |
| tree | 398d8785581708be3eb823fcffdc18b0f8726e65 /pkgs/top-level/qt5-packages.nix | |
| parent | 0523b2e6c2ea7730352fa32e8a921ec331569571 (diff) | |
| parent | cd014bdb858891bc7a3f0c1267ef8ad4fd11f19c (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/qt5-packages.nix')
| -rw-r--r-- | pkgs/top-level/qt5-packages.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index b108626b141b3..751e399484da2 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' { |