From 62d6cdcf99b65ccbc4362ea7630b78295a0387e6 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 6 Mar 2023 17:04:16 +0300
Subject: kwin: drop gcc12stdenv on aarch64 hack

---
 pkgs/desktops/plasma-5/default.nix      | 2 +-
 pkgs/desktops/plasma-5/kwin/default.nix | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index f8fc60a5409..f33688245b1 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -110,7 +110,7 @@ let
                 broken = meta.broken or broken;
               };
           in
-          (args.stdenv or qtStdenv).mkDerivation (args // {
+          qtStdenv.mkDerivation (args // {
             inherit pname version meta outputs setupHook src nativeBuildInputs;
           });
       };
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 6269dd4d0c2..47ddcc95451 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,5 +1,4 @@
 { mkDerivation
-, stdenv
 , lib
 , extra-cmake-modules
 , kdoctools
@@ -57,7 +56,6 @@
 , plasma-framework
 , libqaccessibilityclient
 , python3
-, gcc12Stdenv
 }:
 
 # TODO (ttuegel): investigate qmlplugindump failure
@@ -145,12 +143,9 @@ mkDerivation {
     })
   ];
 
-  stdenv = if stdenv.isAarch64 then gcc12Stdenv else stdenv;
-
   CXXFLAGS = [
     ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
-  ]
-  ++ lib.optional stdenv.isAarch64 "-mno-outline-atomics";
+  ];
 
   postInstall = ''
     # Some package(s) refer to these service types by the wrong name.
-- 
cgit 1.4.1