diff options
| author | Ryan Burns <rtburns@protonmail.com> | 2021-09-19 11:34:48 -0700 |
|---|---|---|
| committer | Ryan Burns <rtburns@protonmail.com> | 2021-09-19 11:36:13 -0700 |
| commit | 879de382a6a086a33e2df931e681a84c76032b7d (patch) | |
| tree | 73c600ee0adef40bc420f05ae74726ea908473db /pkgs/desktops/plasma-5/kwin | |
| parent | 78ca5a3e457c7c1d3f1b77be60d8531426f875e6 (diff) | |
kwin: fix build against libglvnd 1.3.4+
https://hydra.nixos.org/build/153586964 https://bugs.kde.org/show_bug.cgi?id=440372 https://invent.kde.org/plasma/kwin/-/merge_requests/1404 https://invent.kde.org/plasma/kwin/-/merge_requests/1420
Diffstat (limited to 'pkgs/desktops/plasma-5/kwin')
| -rw-r--r-- | pkgs/desktops/plasma-5/kwin/default.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index e6e49a5918108..c650f4ef83df0 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -40,6 +40,18 @@ mkDerivation { ./0002-xwayland.patch ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch + # Fix build against libglvnd 1.3.4+ + # Remove with release 5.22.90 + (fetchpatch { + url = "https://invent.kde.org/plasma/kwin/-/commit/839710201c389b7f4ed248cb3818e755a37ce977.patch"; + sha256 = "09rldhy0sbmqdfpyjzwm20cwnmrmj0w2751vyi5xlr414g0rzyc1"; + }) + # Fixup previous patch for i686 + # Remove with release 5.22.90 + (fetchpatch { + url = "https://invent.kde.org/plasma/kwin/-/commit/38e24ecd6416a975db0989c21b70d6a4cc242f35.patch"; + sha256 = "0zsjmzswcnvfd2jm1c8i9aijpbap1141mjv6y4j282bplyqlp966"; + }) ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' |