Unverified Commit 24beeaa3 authored by K900's avatar K900 Committed by GitHub
Browse files

kdePackages.libplasma: fix build nondeterminism (#470710)

parents 5b6b9f3a 974bcac2

pkgs/kde/plasma/libplasma/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ 
mkKdeDerivation {

  pname = "libplasma";



  patches = [

    # https://invent.kde.org/plasma/libplasma/-/merge_requests/1406

    ./rb-extracomponents.patch

  ];



  extraNativeBuildInputs = [ pkg-config ];



  extraBuildInputs = [

pkgs/kde/plasma/libplasma/rb-extracomponents.patch

0 → 100644
+37 −0
Original line number Diff line number Diff line 
commit 49d9faf0b11b3957d36c21f90b9f34933f507438

Author: Arnout Engelen <arnout@bzzt.net>

Date:   Sun Dec 14 10:43:57 2025 +0100



    reproducible builds: make qml dependencies 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..a8e335af7 100644

--- a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt

+++ b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt

@@ -1,4 +1,8 @@

-ecm_add_qml_module(plasmaextracomponentsplugin VERSION 2.0 URI "org.kde.plasma.extras" GENERATE_PLUGIN_SOURCE)

+ecm_add_qml_module(plasmaextracomponentsplugin URI "org.kde.plasma.extras"

+  VERSION 2.0

+  GENERATE_PLUGIN_SOURCE

+  LIBRARIES org_kde_plasmacomponents3

+)

 

 target_sources(plasmaextracomponentsplugin PRIVATE

     qmenu.cpp

@@ -42,7 +46,9 @@ target_link_libraries(plasmaextracomponentsplugin PRIVATE

         Qt6::Qml

         Qt6::Widgets

         KF6::WidgetsAddons

-        Plasma::Plasma)

+        Plasma::Plasma

+        org_kde_plasmacomponents3

+)

 

 ecm_finalize_qml_module(plasmaextracomponentsplugin DESTINATION ${KDE_INSTALL_QMLDIR})