From 79ff0fcd9ae1d25b85f66196db3f1010959cc29a Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 17 Jan 2025 15:46:57 +0200 Subject: [PATCH] xf86videonouveau: unbreak build Signed-off-by: Alexander V. Nikolaev --- pkgs/servers/x11/xorg/overrides.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6014bd7fb19c..23fe9de21d6b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -592,9 +592,12 @@ self: super: }); xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: { - nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; - buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; - # fixes `implicit declaration of function 'wfbScreenInit'; did you mean 'fbScreenInit'?` + nativeBuildInputs = attrs.nativeBuildInputs ++ [ + autoreconfHook + buildPackages.xorg.utilmacros # For xorg-utils.m4 macros + buildPackages.xorg.xorgserver # For xorg-server.m4 macros + ]; + # fixes `implicit declaration of function 'wfbScreenInit'; did you mean 'fbScreenInit'? NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; });