From 4aab8f1612551c8bbbbfe2cee4712ec6302cd6f5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 13 Aug 2022 20:11:43 +0800 Subject: [PATCH] wlr-protocols: move wayland-scanner from checkInputs to nativeBuildInputs, fix cross compilation --- pkgs/development/libraries/wlroots/protocols.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wlroots/protocols.nix b/pkgs/development/libraries/wlroots/protocols.nix index 7fd0e40d0754..d2ff39d7d574 100644 --- a/pkgs/development/libraries/wlroots/protocols.nix +++ b/pkgs/development/libraries/wlroots/protocols.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; - checkInputs = [ wayland-scanner ]; + nativeBuildInputs = [ wayland-scanner ]; patchPhase = '' substituteInPlace wlr-protocols.pc.in \ @@ -25,9 +25,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkPhase = '' - make check - ''; + checkTarget = "check"; installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];