Unverified Commit 60f10be4 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #267503 from Artturin/fixmistake

parents 1a836284 a28d96f4

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -24631,7 +24631,7 @@ with pkgs; 
    });















  libsForQt5 = recurseIntoAttrs (import ./qt5-packages.nix {













    inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsBuildHost;













    inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget;















  });





























  # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop

























pkgs/top-level/qt5-packages.nix



+3
−3






























Original line number
Diff line number
Diff line








@@ -10,15 +10,15 @@













, __splicedPackages















, makeScopeWithSplicing'















, generateSplicesForMkScope













, pkgsBuildHost













, pkgsHostTarget















}:































let















  pkgs = __splicedPackages;















  # 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;













  # pkgsHostTarget == pkgs













  qt5 = pkgsHostTarget.qt5;















in































makeScopeWithSplicing' {