From b7f046b9d4152003661bba9202cca77b9f4f66a4 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 24 Jan 2025 08:25:56 +0100 Subject: [PATCH] libsForQt5.extra-cmake-modules: fix strictDeps usage --- .../kde-frameworks/extra-cmake-modules/default.nix | 12 ++++++++++++ .../kde-frameworks/extra-cmake-modules/setup-hook.sh | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 11a807d190ad..c3aa3f518e22 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -2,6 +2,7 @@ mkDerivation, lib, fetchpatch, + bash, cmake, pkg-config, }: @@ -19,11 +20,22 @@ mkDerivation { outputs = [ "out" ]; # this package has no runtime components + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + bash + ]; + + # note: these will be propagated into the same list extra-cmake-modules is in propagatedBuildInputs = [ cmake pkg-config ]; + strictDeps = true; + setupHook = ./setup-hook.sh; meta = with lib; { diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index abf330fd9662..853a163fab98 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -1,3 +1,9 @@ +ecmCMakeFlags() { + appendToVar cmakeFlags "-DECM_DIR=@out@/share/ECM/cmake" +} + +preConfigureHooks+=(ecmCMakeFlags) + ecmEnvHook() { addToSearchPath XDG_DATA_DIRS "$1/share" addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"