colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libsForQt5: fix using pkgsCross.aarch64-multiplatform.pkgsBuildTarget.targetPackages.libsForQt5.qtbase explicitly

Browse Source 
without splicing interfering

in, for example, `nativeBuildInputs`.
This commit is contained in:
Artturin 2023-11-14 00:53:19 +02:00
parent 45c8340ae6
commit 7798b77c09
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View File

@ -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

6
pkgs/top-level/qt5-packages.nix
View File

@ -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' {