Skip to content

Commit

Permalink
qt5.qtModule: add explicit pkgsHostTarget.qt5.qtbase.dev to nativeBui…
Browse files Browse the repository at this point in the history
…ldInputs if cross compiling
  • Loading branch information
Adam Joseph authored and Adam Joseph committed Nov 5, 2023
1 parent 7fea375 commit 94451ae
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion pkgs/development/libraries/qt-5/qtModule.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
, qmake
, patches
, srcs
, pkgsHostTarget
}:

let inherit (lib) licenses maintainers platforms; in
Expand All @@ -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 []);
Expand Down

0 comments on commit 94451ae

Please sign in to comment.