qt6Packages.stdenv: condition on config.allowAliases (#370783)
This commit is contained in:
@@ -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;
|
||||
});
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user