From bd8f78d18cb408bc8c507f26a7cde453793129bd Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 24 Nov 2023 16:35:29 +0200 Subject: [PATCH] qt6Packages: fix mistake --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/qt6-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 c38810ebe134..2cb19b593a0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24665,7 +24665,7 @@ with pkgs; qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { }); qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix { - inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsBuildHost; + inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 2947083804d3..1cd1b731c469 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -9,15 +9,15 @@ , makeScopeWithSplicing' , generateSplicesForMkScope , stdenv -, pkgsBuildHost +, pkgsHostTarget }: let pkgs = __splicedPackages; # qt6 set should not be pre-spliced to prevent spliced packages being a part of an unspliced set # 'pkgsCross.aarch64-multiplatform.pkgsBuildTarget.targetPackages.qt6Packages.qtbase' should not have a `__spliced` but if qt6 is pre-spliced then it will have one. - # pkgsBuildHost == pkgs - qt6 = pkgsBuildHost.qt6; + # pkgsHostTarget == pkgs + qt6 = pkgsHostTarget.qt6; in makeScopeWithSplicing' {