File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed
Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 4141 ) allUrls ;
4242 in
4343 (
44- qt6Packages
44+ # This removes reference to deprecated `qt6Packages.stdenv`
45+ # so when a KDE package asks for a stdenv, it won't trigger
46+ # an eval warning
47+ ( lib . removeAttrs qt6Packages [ "stdenv" ] )
4548 // frameworks
4649 // gear
4750 // plasma
6669 # Alias because it's just data
6770 plasma-wayland-protocols = libsForQt5 . plasma-wayland-protocols ;
6871
69- # Alias because `self.callPackage` would give deprecated
70- # `qt6Packages.stdenv` when asked for `stdenv`
71- inherit stdenv ;
72-
7372 selenium-webdriver-at-spi = null ; # Used for integration tests that we don't run, stub
7473
7574 alpaka = self . callPackage ./misc/alpaka { } ;
Original file line number Diff line number Diff line change @@ -126,5 +126,6 @@ makeScopeWithSplicing' {
126126 xwaylandvideobridge = kdePackages . callPackage ../tools/wayland/xwaylandvideobridge { } ;
127127 } ) ;
128128} // lib . optionalAttrs config . allowAliases {
129+ # when removing, don't forget to remove a workaround in `pkgs/kde/default.nix`
129130 stdenv = lib . warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv ; # Added for 25.05
130131}
You can’t perform that action at this time.
0 commit comments