dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #267323 from Artturin/qt5presplicefix

Browse Source
This commit is contained in:
Artturi 2023-11-14 15:55:40 +02:00 committed by GitHub
commit e72e6a80e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -24631,7 +24631,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' {