Skip to content

Commit 57f6015

Browse files
authored
qt6Packages.stdenv: condition on config.allowAliases (NixOS#370783)
2 parents 9dd10e1 + f54ce21 commit 57f6015

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10482,7 +10482,7 @@ with pkgs;
1048210482
qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });
1048310483

1048410484
qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix {
10485-
inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
10485+
inherit lib config __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
1048610486
inherit stdenv;
1048710487
});
1048810488

pkgs/top-level/qt6-packages.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# this file.
66

77
{ lib
8+
, config
89
, __splicedPackages
910
, makeScopeWithSplicing'
1011
, generateSplicesForMkScope
@@ -124,6 +125,6 @@ makeScopeWithSplicing' {
124125

125126
xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };
126127
});
127-
} // {
128+
} // lib.optionalAttrs config.allowAliases {
128129
stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05
129130
}

0 commit comments

Comments
 (0)