From cd8b2aa9b20f2a14d1d0563e055a3f668e5e03ec Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 23 Apr 2023 10:18:55 +0000 Subject: [PATCH] dwl: fix cross I've moved the install flags into makeFlags because there's no need to have them only set at install time. --- pkgs/applications/window-managers/dwl/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 7bab957da04..581dab562eb 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -9,6 +9,7 @@ , pixman , pkg-config , substituteAll +, wayland-scanner , wayland , wayland-protocols , wlroots_0_16 @@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles pkg-config + wayland-scanner ]; buildInputs = [ @@ -61,6 +63,13 @@ stdenv.mkDerivation (finalAttrs: { else writeText "config.def.h" conf; in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + makeFlags = [ + "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" + "WAYLAND_SCANNER=wayland-scanner" + "PREFIX=$(out)" + "MANDIR=$(man)/share/man/man1" + ]; + preBuild = '' makeFlagsArray+=( XWAYLAND=${lib.optionalString enableXWayland "-DXWAYLAND"} @@ -68,11 +77,6 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - installFlags = [ - "PREFIX=$(out)" - "MANDIR=$(man)/share/man/man1" - ]; - meta = { homepage = "https://github.com/djpohly/dwl/"; description = "Dynamic window manager for Wayland";