From 94451ae7cf257b82d548cefbc93a8c468f949ea5 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 3 Nov 2023 21:59:25 -0700 Subject: [PATCH] qt5.qtModule: add explicit pkgsHostTarget.qt5.qtbase.dev to nativeBuildInputs if cross compiling --- pkgs/development/libraries/qt-5/qtModule.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index e5d1e1f5422e..54d24e46092f 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -6,6 +6,7 @@ , qmake , patches , srcs +, pkgsHostTarget }: let inherit (lib) licenses maintainers platforms; in @@ -22,7 +23,12 @@ mkDerivation (args // { inherit pname version src; patches = (args.patches or []) ++ (patches.${pname} or []); - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl qmake ]; + nativeBuildInputs = + (args.nativeBuildInputs or []) ++ [ + perl qmake + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + pkgsHostTarget.qt5.qtbase.dev + ]; propagatedBuildInputs = (lib.warnIf (args ? qtInputs) "qt5.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ (args.propagatedBuildInputs or []);