Skip to content

Commit fee4f9b

Browse files
committed
mkKdeDerivation: do not use stdenv from qt6Packages
Previously, mkKdeDerivation used stdenv from `qt6Packages`, but now it is deprecated and raises an eval warning. This fix removes `stdenv` from `qt6Packages` before calling `mkKdeDerivation`. I also created similar PR NixOS#371444, but it exposed `kdePackages.stdenv` which is not good. And this commit is not a breaking change, because `kdePackages.stdenv` was provided for only a few hours in master.
1 parent 2b6b141 commit fee4f9b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pkgs/kde/default.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ let
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
@@ -66,10 +69,6 @@ let
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 { };

pkgs/top-level/qt6-packages.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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
}

0 commit comments

Comments
 (0)