From e3634f4f6f124bdc59dd2539ce14adf2db4af450 Mon Sep 17 00:00:00 2001
From: Shinyzenith <aakashsensharma@gmail.com>
Date: Tue, 17 Oct 2023 09:18:47 +0530
Subject: [PATCH] ci: Fix make flag issue in ci

Signed-off-by: Shinyzenith <aakashsensharma@gmail.com>
---
 .builds/alpine.yml          | 4 ++--
 .builds/nix.yml             | 4 ++--
 .github/workflows/arch.yaml | 4 ++--
 .github/workflows/nix.yaml  | 4 ++--
 Makefile                    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index 70f729e..0223920 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -61,10 +61,10 @@ tasks:
           sudo mv ./zig-linux-x86_64-$ZIG_VERSION/lib /usr/lib/zig
 
     - build: |
-          make -C NextWM
+          cd NextWM; zig build
 
     - build-xwayland: |
-          make BUILD_FLAGS="-Dxwayland -Dxwayland-lazy" -C NextWM
+          cd NextWM; zig build -Dxwayland -Dxwayland-lazy
 
     - build-rs: |
           make -C NextWM/nextctl-rs
diff --git a/.builds/nix.yml b/.builds/nix.yml
index d253cdc..6bffc45 100644
--- a/.builds/nix.yml
+++ b/.builds/nix.yml
@@ -11,10 +11,10 @@ sources:
 
 tasks:
     - build: |
-          cd NextWM; nix develop --command make
+          cd NextWM; nix develop --command zig build
 
     - build-xwayland: |
-          cd NextWM; nix develop --command make BUILD_FLAGS="-Dxwayland -Dxwayland-lazy"
+          cd NextWM; nix develop --command zig build -Dxwayland -Dxwayland-lazy
 
     - build-rs: |
           cd NextWM; nix develop --command make -C ./nextctl-rs
diff --git a/.github/workflows/arch.yaml b/.github/workflows/arch.yaml
index bbae486..4341038 100644
--- a/.github/workflows/arch.yaml
+++ b/.github/workflows/arch.yaml
@@ -55,11 +55,11 @@ jobs:
 
             - name: Build NextWM
               run: |
-                  make
+                  zig build
 
             - name: Build NextWM-Xwayland
               run: |
-                  make BUILD_FLAGS="-Dxwayland -Dxwayland-lazy"
+                  zig build -Dxwayland -Dxwayland-lazy
 
             - name: Build Nextctl-rs
               run: |
diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml
index ef6c9da..e6fe5ee 100644
--- a/.github/workflows/nix.yaml
+++ b/.github/workflows/nix.yaml
@@ -22,11 +22,11 @@ jobs:
 
             - name: Build NextWM
               run: |
-                  nix develop --command make
+                  nix develop --command zig build
 
             - name: Build NextWM-Xwayland
               run: |
-                  nix develop --command make BUILD_FLAGS="-Dxwayland -Dxwayland-lazy"
+                  nix develop --command zig build -Dxwayland -Dxwayland-lazy
 
             - name: Build Nextctl-rs
               run: |
diff --git a/Makefile b/Makefile
index d3bc2f8..3e36482 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-PREFIX=/usr
-BUILD_FLAGS =
+PREFIX:=/usr
+BUILD_FLAGS:=
 
 build:
 	zig build $(BUILD_FLAGS)