From fee4f9b2be4e5a8c0847350a530f38c947492968 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Mon, 6 Jan 2025 15:55:56 +0100
Subject: [PATCH] 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 #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.
---
 pkgs/kde/default.nix            | 9 ++++-----
 pkgs/top-level/qt6-packages.nix | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix
index 518efd7c7b64..f6d88446c682 100644
--- a/pkgs/kde/default.nix
+++ b/pkgs/kde/default.nix
@@ -41,7 +41,10 @@ let
       ) allUrls;
     in
     (
-      qt6Packages
+      # This removes reference to deprecated `qt6Packages.stdenv`
+      # so when a KDE package asks for a stdenv, it won't trigger
+      # an eval warning
+      (lib.removeAttrs qt6Packages [ "stdenv" ])
       // frameworks
       // gear
       // plasma
@@ -66,10 +69,6 @@ let
         # Alias because it's just data
         plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols;
 
-        # Alias because `self.callPackage` would give deprecated
-        # `qt6Packages.stdenv` when asked for `stdenv`
-        inherit stdenv;
-
         selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub
 
         alpaka = self.callPackage ./misc/alpaka { };
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 0834419e13bd..9e02fbbb1121 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -126,5 +126,6 @@ makeScopeWithSplicing' {
   xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };
   });
 } // lib.optionalAttrs config.allowAliases {
+  # when removing, don't forget to remove a workaround in `pkgs/kde/default.nix`
   stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv; # Added for 25.05
 }