diff options
| author | K900 <me@0upti.me> | 2023-02-14 14:06:59 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-02-14 14:15:58 +0300 |
| commit | ebd78ed69f7a526cfc9ddea22acff5d0d7326795 (patch) | |
| tree | a69b580d0d5423edc54a8cb495d4604939b66790 | |
| parent | 06ca9b6bd82924d28bbe2489d3d72f56a6d5a427 (diff) | |
lxqt-config: backport build fixes for Plasma 5.27
| -rw-r--r-- | pkgs/desktops/lxqt/lxqt-config/default.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 55239caf2bd17..727ae63585991 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 |