diff options
| author | Arnout Engelen <arnout@bzzt.net> | 2025-12-14 12:54:48 +0100 |
|---|---|---|
| committer | Arnout Engelen <arnout@bzzt.net> | 2025-12-15 11:46:03 +0100 |
| commit | 17877a8b7074bbcfbccda02f52f49a3d36d0d240 (patch) | |
| tree | 246e594140b4d2d1a1a3dea19ba9380f0d571b93 /pkgs/kde | |
| parent | sfizz-ui: new package, to reflect the upstream split of sfizz (#457744) (diff) | |
| download | nixpkgs-17877a8b7074bbcfbccda02f52f49a3d36d0d240.tar.gz | |
kdePackages.libplasma: fix build nondeterminism
Cherry-pick
https://invent.kde.org/plasma/libplasma/-/merge_requests/1406 for wider testing
Fixes #458839
Diffstat (limited to 'pkgs/kde')
| -rw-r--r-- | pkgs/kde/plasma/libplasma/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/kde/plasma/libplasma/rb-extracomponents.patch | 27 |
2 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/kde/plasma/libplasma/default.nix b/pkgs/kde/plasma/libplasma/default.nix index f13240876725..453c9d328f9e 100644 --- a/pkgs/kde/plasma/libplasma/default.nix +++ b/pkgs/kde/plasma/libplasma/default.nix @@ -8,6 +8,11 @@ mkKdeDerivation { pname = "libplasma"; + patches = [ + # https://invent.kde.org/plasma/libplasma/-/merge_requests/1406 + ./rb-extracomponents.patch + ]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ diff --git a/pkgs/kde/plasma/libplasma/rb-extracomponents.patch b/pkgs/kde/plasma/libplasma/rb-extracomponents.patch new file mode 100644 index 000000000000..e2f7f1a94997 --- /dev/null +++ b/pkgs/kde/plasma/libplasma/rb-extracomponents.patch @@ -0,0 +1,27 @@ +commit fd5e1a04b024a9b955d6942e52295582144fbea7 +Author: Arnout Engelen <arnout@bzzt.net> +Date: Sun Dec 14 10:43:57 2025 +0100 + + reproducible builds: make qml dependency explicit + + Similar to https://qt-project.atlassian.net/browse/QTBUG-137440 + + To fix https://bugs.kde.org/show_bug.cgi?id=512868 + + 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 :) + +diff --git a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt +index 1a7827819..989318c80 100644 +--- a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt ++++ b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt +@@ -44,6 +44,10 @@ target_link_libraries(plasmaextracomponentsplugin PRIVATE + KF6::WidgetsAddons + Plasma::Plasma) + ++add_dependencies(plasmaextracomponentsplugin ++ org_kde_plasmacomponents3 ++) ++ + ecm_finalize_qml_module(plasmaextracomponentsplugin DESTINATION ${KDE_INSTALL_QMLDIR}) + + ecm_generate_qdoc(plasmaextracomponentsplugin plasmaextras.qdocconf) |