From c4bec8d7b02567da2d130d373b25a3adbcabdff9 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 14 Dec 2025 12:49:47 +0100 Subject: [PATCH] kdePackages.powerdevil: fix build nondeterminism Cherry-pick https://invent.kde.org/plasma/powerdevil/-/merge_requests/595 for wider testing Fixes #467100 --- pkgs/kde/plasma/powerdevil/default.nix | 4 ++++ .../kde/plasma/powerdevil/rb-brightness.patch | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/kde/plasma/powerdevil/rb-brightness.patch diff --git a/pkgs/kde/plasma/powerdevil/default.nix b/pkgs/kde/plasma/powerdevil/default.nix index ae2b56a004f2..095a45beb866 100644 --- a/pkgs/kde/plasma/powerdevil/default.nix +++ b/pkgs/kde/plasma/powerdevil/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "powerdevil"; + patches = [ + # https://invent.kde.org/plasma/powerdevil/-/merge_requests/595 + ./rb-brightness.patch + ]; extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ ddcutil diff --git a/pkgs/kde/plasma/powerdevil/rb-brightness.patch b/pkgs/kde/plasma/powerdevil/rb-brightness.patch new file mode 100644 index 000000000000..a73692a2cb9b --- /dev/null +++ b/pkgs/kde/plasma/powerdevil/rb-brightness.patch @@ -0,0 +1,24 @@ +commit a34d894278d2c7938427d3c4d0fc07d96c26e55f +Author: Arnout Engelen +Date: Sun Dec 14 11:33:08 2025 +0100 + + reproducible builds: make build deterministic by adding explicit deps + + Similar to https://qt-project.atlassian.net/browse/QTBUG-137440 + + To fix https://bugs.kde.org/show_bug.cgi?id=512867 + + I'll admit I don't quite know what I'm doing here, I'm mostly guessing and mimicking, but it does seem to remove the nondeterminism :) + + Inspired in part by https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/6075/diffs + +diff --git a/applets/brightness/CMakeLists.txt b/applets/brightness/CMakeLists.txt +index 3d1fce43..99331f85 100644 +--- a/applets/brightness/CMakeLists.txt ++++ b/applets/brightness/CMakeLists.txt +@@ -16,3 +16,5 @@ plasma_add_applet(org.kde.plasma.brightness + PopupDialog.qml + GENERATE_APPLET_CLASS + ) ++ ++add_dependencies(org.kde.plasma.brightness brightnesscontrolplugin)