From cf8640a35b65ff7da10778fc7835cc5817e8ea5c Mon Sep 17 00:00:00 2001 From: eryngion Date: Wed, 4 Feb 2026 22:08:25 +0000 Subject: [PATCH] libv4l: don't pull qtbase into cross-compiled builds --- pkgs/by-name/v4/v4l-utils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/v4/v4l-utils/package.nix b/pkgs/by-name/v4/v4l-utils/package.nix index d565f8de3fc9..06c7db58d0f5 100644 --- a/pkgs/by-name/v4/v4l-utils/package.nix +++ b/pkgs/by-name/v4/v4l-utils/package.nix @@ -30,7 +30,7 @@ let withQt = withUtils && withGUI; - + isCrossBuild = !(lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform); in # we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt stdenv.mkDerivation (finalAttrs: { @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { # Meson unable to find moc/uic/rcc in case of cross-compilation # https://github.com/mesonbuild/meson/issues/13018 - preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + preConfigure = lib.optionalString (isCrossBuild && withQt) '' export PATH=${buildPackages.qt6Packages.qtbase}/libexec:$PATH '';