From dc113b96a81a49a0e056990c51f1505a35fb75f7 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 27 Jun 2020 10:40:02 -0700 Subject: [PATCH] powerdevil: fix build with new ddcutil https://hydra.nixos.org/build/123207159 The KDE ISO depends on this package, which blocks nixos-unstable. Upstream bug: https://bugs.kde.org/show_bug.cgi?id=423605 --- pkgs/desktops/plasma-5/powerdevil.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index e53e986060f..e6b2c472bc8 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, fetchpatch, extra-cmake-modules, kdoctools, bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, @@ -18,4 +18,14 @@ mkDerivation { cmakeFlags = [ "-DHAVE_DDCUTIL=On" ]; + patches = [ + # This fixes an issue where 'DDCA_Feature_List*' cannot be converted to + # 'DDCA_Feature_List'. + # This can be dropped with the next release. + # https://bugs.kde.org/show_bug.cgi?id=423605 + (fetchpatch { + url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch"; + sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s"; + }) + ]; }