qt6Packages.stdenv: condition on config.allowAliases (#370783)

This commit is contained in:
Weijia Wang
2025-01-04 04:08:27 +01:00
committed by GitHub
2 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -10482,7 +10482,7 @@ with pkgs;
qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });
qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix {
inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
inherit lib config __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
inherit stdenv;
});
+2 -1
View File
@@ -5,6 +5,7 @@
# this file.
{ lib
, config
, __splicedPackages
, makeScopeWithSplicing'
, generateSplicesForMkScope
@@ -124,6 +125,6 @@ makeScopeWithSplicing' {
xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };
});
} // {
} // lib.optionalAttrs config.allowAliases {
stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05
}