diff options
| author | Artturin <Artturin@artturin.com> | 2023-11-14 00:53:19 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-11-14 00:53:19 +0200 |
| commit | 7798b77c09417a945774017a925a0042350a1d4f (patch) | |
| tree | 79d5756c74a55f61c3b762324e39e3e4ea3c2d9d /pkgs | |
| parent | 45c8340ae636b0f2bb25a2d13e230071f73acb33 (diff) | |
| download | nixpkgs-7798b77c09417a945774017a925a0042350a1d4f.tar nixpkgs-7798b77c09417a945774017a925a0042350a1d4f.tar.gz nixpkgs-7798b77c09417a945774017a925a0042350a1d4f.tar.bz2 nixpkgs-7798b77c09417a945774017a925a0042350a1d4f.tar.lz nixpkgs-7798b77c09417a945774017a925a0042350a1d4f.tar.xz nixpkgs-7798b77c09417a945774017a925a0042350a1d4f.tar.zst nixpkgs-7798b77c09417a945774017a925a0042350a1d4f.zip | |
libsForQt5: fix using `pkgsCross.aarch64-multiplatform.pkgsBuildTarget.targetPackages.libsForQt5.qtbase` explicitly
without splicing interfering in, for example, `nativeBuildInputs`.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/qt5-packages.nix | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba8b2315727..67e41855dac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index d675c86797d..6a1fe368f34 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -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' { |