diff options
| author | K900 <me@0upti.me> | 2023-03-06 17:04:16 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-03-06 17:04:16 +0300 |
| commit | 62d6cdcf99b65ccbc4362ea7630b78295a0387e6 (patch) | |
| tree | 7bde5e19f301198bd7c4aa55a1bc28be4d086657 | |
| parent | a5961d953498cd3dbb0dd63d1242a3d3d1171280 (diff) | |
| download | nixpkgs-62d6cdcf99b65ccbc4362ea7630b78295a0387e6.tar nixpkgs-62d6cdcf99b65ccbc4362ea7630b78295a0387e6.tar.gz nixpkgs-62d6cdcf99b65ccbc4362ea7630b78295a0387e6.tar.bz2 nixpkgs-62d6cdcf99b65ccbc4362ea7630b78295a0387e6.tar.lz nixpkgs-62d6cdcf99b65ccbc4362ea7630b78295a0387e6.tar.xz nixpkgs-62d6cdcf99b65ccbc4362ea7630b78295a0387e6.tar.zst nixpkgs-62d6cdcf99b65ccbc4362ea7630b78295a0387e6.zip | |
kwin: drop gcc12stdenv on aarch64 hack
| -rw-r--r-- | pkgs/desktops/plasma-5/default.nix | 2 | ||||
| -rw-r--r-- | 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. |