From ebd78ed69f7a526cfc9ddea22acff5d0d7326795 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 14 Feb 2023 14:06:59 +0300 Subject: [PATCH] lxqt-config: backport build fixes for Plasma 5.27 --- pkgs/desktops/lxqt/lxqt-config/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 55239caf2bd1..727ae6358599 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , cmake , pkg-config , glib @@ -29,6 +30,17 @@ mkDerivation rec { sha256 = "WgrcHM4iJLZsJO2obqSkjHHMB+/kcadQArkcXC5FB24="; }; + patches = [ + # FIXME: backport Plasma 5.27 build fix, remove for next release + (fetchpatch { + url = "https://github.com/lxqt/lxqt-config/commit/6add4e4f0040693e7c4242fbae48c9d32007686c.diff"; + hash = "sha256-Tir4KeGhBnD9dYmB1FAjuf4R4V+rn12MOxsRwTdE0Sc="; + }) + ]; + + # FIXME: required to build with Plasma 5.27, which uses std::optional + cmakeFlags = ["-DCMAKE_CXX_STANDARD=17"]; + nativeBuildInputs = [ cmake pkg-config