From 7e61ef9c482a825271e048791b45719e21e64034 Mon Sep 17 00:00:00 2001 From: Naxdy Date: Sun, 21 Apr 2024 10:23:35 +0200 Subject: [PATCH 1/2] kdePackages/ecm: format --- pkgs/kde/frameworks/extra-cmake-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix index 0a06cf4a8772..2c7d6b7153ba 100644 --- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix +++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -1,8 +1,8 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "extra-cmake-modules"; - outputs = ["out"]; + outputs = [ "out" ]; setupHook = ./ecm-hook.sh; } From 20cd060754562e439dfe03115482c9c804849643 Mon Sep 17 00:00:00 2001 From: Naxdy Date: Sun, 21 Apr 2024 20:25:59 +0200 Subject: [PATCH 2/2] kdePackages/ecm: add `python3` to `extraPropagatedBuildInputs` --- pkgs/kde/frameworks/extra-cmake-modules/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix index 2c7d6b7153ba..b7dc85d277a3 100644 --- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix +++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -1,8 +1,16 @@ -{ mkKdeDerivation }: +{ mkKdeDerivation +, python3 +}: mkKdeDerivation { pname = "extra-cmake-modules"; outputs = [ "out" ]; + # Packages that have an Android APK (e.g. KWeather) require Python3 at build time. + # See: https://invent.kde.org/frameworks/extra-cmake-modules/-/blob/v6.1.0/modules/ECMAddAndroidApk.cmake?ref_type=tags#L57 + propagatedNativeBuildInputs = [ + python3 + ]; + setupHook = ./ecm-hook.sh; }