From 8bb19fd30864c5f17cd216f31365519a94331dc7 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Tue, 18 Mar 2025 21:43:14 -0700
Subject: [PATCH] qt6Packages: remove stdenv fully

---
 pkgs/kde/default.nix            | 5 +----
 pkgs/top-level/qt6-packages.nix | 3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix
index 76a9d19e28aa..14acfe0f2f7f 100644
--- a/pkgs/kde/default.nix
+++ b/pkgs/kde/default.nix
@@ -40,10 +40,7 @@ let
       ) allUrls;
     in
     (
-      # 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" ])
+      qt6Packages
       // frameworks
       // gear
       // plasma
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index fd3606df0d75..5a8823d10493 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -134,7 +134,4 @@ 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
 }