Unverified Commit 8f063e6c authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

libv4l: don't pull qtbase into cross-compiled builds (#487060)

parents 6d7d8e4f cf8640a3

pkgs/by-name/v4/v4l-utils/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

  '';