nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #219837 from K900/drop-kwin-stdenv-hack

Browse Source 
kwin: drop gcc12stdenv on aarch64 hack
This commit is contained in:
K900 2023-03-06 17:05:25 +03:00 committed by GitHub
commit 4ccac6fd23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/plasma-5/default.nix
View File

@ -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;
});
};

7
pkgs/desktops/plasma-5/kwin/default.nix
View File

@ -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.