From a28d96f47e485f8327673a648cc1a0524ab0ba5b Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 14 Nov 2023 20:38:33 +0200 Subject: [PATCH] libsForQt5: fix mistake --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/qt5-packages.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb085c1fb66e..86500fdaa4cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 6a1fe368f34a..81308413d3cd 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -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' {