From aaafc00079e09f47e38bc25874e9535c4233f485 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 5 Aug 2024 22:19:26 +0300 Subject: [PATCH] vaapiIntel: depend on wayland-scanner Otherwise, wayland-scanner would be picked up from the wayland in buildInputs, which isn't cross-friendly and will stop working when we split wayland-scanner into a separate package. --- .../libraries/intel-vaapi-driver/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/intel-vaapi-driver/default.nix b/pkgs/development/libraries/intel-vaapi-driver/default.nix index 5622ad158f91..9f9e2f2bbd40 100644 --- a/pkgs/development/libraries/intel-vaapi-driver/default.nix +++ b/pkgs/development/libraries/intel-vaapi-driver/default.nix @@ -1,7 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkg-config, python3 -, intel-gpu-tools, libdrm, libva +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, gnum4, pkg-config, python3, wayland-scanner +, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext , enableHybridCodec ? false, vaapi-intel-hybrid -, enableGui ? true, libX11, libGL, wayland, libXext +, enableGui ? true }: stdenv.mkDerivation rec { @@ -27,7 +28,9 @@ stdenv.mkDerivation rec { (lib.enableFeature enableGui "wayland") ] ++ lib.optional enableHybridCodec "--enable-hybrid-codec"; - nativeBuildInputs = [ autoreconfHook gnum4 pkg-config python3 ]; + nativeBuildInputs = [ + autoreconfHook gnum4 pkg-config python3 wayland-scanner + ]; buildInputs = [ intel-gpu-tools libdrm libva ] ++ lib.optionals enableGui [ libX11 libXext libGL wayland ]