From 6ca3adca7e4cd73466c9a851810d094e3a1c6778 Mon Sep 17 00:00:00 2001
From: dark0dave <dark0dave@mykolab.com>
Date: Sun, 30 Nov 2025 17:41:39 +0000
Subject: [PATCH] fix(nix): Fixes for nix builds

Signed-off-by: dark0dave <dark0dave@mykolab.com>
---
 .github/workflows/main.yaml | 23 ++++++++++++++++++++---
 .github/workflows/tag.yaml  | 33 ++++++++++++++++++++++++++++-----
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index cab4f22..83b167e 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -5,15 +5,31 @@ concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 jobs:
-  build-nix:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: build elkhound
+        run: |
+          sudo apt-get update -yqqq
+          sudo apt-get install -yqqq bison cmake flex wget libfl-dev
+          mkdir -p obj
+          cmake -Wno-dev -S src -B obj -DEXTRAS=OFF -DOCAML=OFF -DCMAKE_BUILD_TYPE=Release
+          make -j$(npoc) -C obj
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ubuntu-latest
+          path: obj/elkhound/elkhound
+          if-no-files-found: error
+  build-macos:
     strategy:
       matrix:
         include:
           - os: macos-latest
             target: '.#packages.aarch64-darwin'
             suffix: ''
-          - os: ubuntu-latest
-            target: '.#packages.x86_64-linux'
+          - os: macos-15-intel
+            target: '.#packages.x86_64-darwin'
             suffix: ''
     runs-on: ${{ matrix.os }}
     steps:
@@ -27,6 +43,7 @@ jobs:
         with:
           name: ${{ matrix.os }}
           path: result/bin/elkhound
+          if-no-files-found: error
   windows-build:
     runs-on: windows-2022
     steps:
diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
index 3d73021..f924f11 100644
--- a/.github/workflows/tag.yaml
+++ b/.github/workflows/tag.yaml
@@ -4,15 +4,31 @@ on:
     tags:
       - "*"
 jobs:
-  build-nix:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: build elkhound
+        run: |
+          sudo apt-get update -yqqq
+          sudo apt-get install -yqqq bison cmake flex wget libfl-dev
+          mkdir -p obj
+          cmake -Wno-dev -S src -B obj -DEXTRAS=OFF -DOCAML=OFF -DCMAKE_BUILD_TYPE=Release
+          make -j$(npoc) -C obj
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ubuntu-latest
+          path: obj/elkhound/elkhound
+          if-no-files-found: error
+  build-macos:
     strategy:
       matrix:
         include:
           - os: macos-latest
             target: '.#packages.aarch64-darwin'
             suffix: ''
-          - os: ubuntu-latest
-            target: '.#packages.x86_64-linux'
+          - os: macos-15-intel
+            target: '.#packages.x86_64-darwin'
             suffix: ''
     runs-on: ${{ matrix.os }}
     steps:
@@ -26,6 +42,7 @@ jobs:
         with:
           name: ${{ matrix.os }}
           path: result/bin/elkhound
+          if-no-files-found: error
   windows-build:
     runs-on: windows-2022
     steps:
@@ -70,6 +87,7 @@ jobs:
         with:
           name: win-elkhound
           path: build/elkhound/elkhound.exe
+          if-no-files-found: error
   release:
     name: release
     permissions:
@@ -80,8 +98,12 @@ jobs:
       - uses: actions/checkout@main
       - uses: actions/download-artifact@main
         with:
-          name: macos-latest
+          name: macos-15-intel
           path: macos-elkhound
+      - uses: actions/download-artifact@main
+        with:
+          name: macos-latest
+          path: macos-arm-elkhound
       - uses: actions/download-artifact@main
         with:
           name: ubuntu-latest
@@ -93,10 +115,11 @@ jobs:
       - run: |
           mv macos-elkhound/elkhound mac-elkhound
           mv linux-elkhound/elkhound lin-elkhound
+          mv macos-arm-elkhound/elkhound mac-arm-elkhound
           mv win-elkhound/elkhound.exe elkhound.exe
       - name: Create Release
         id: create_release
         uses: ncipollo/release-action@main
         with:
           generateReleaseNotes: true
-          artifacts: "lin-elkhound,mac-elkhound,elkhound.exe"
+          artifacts: "lin-elkhound,mac-elkhound,mac-arm-elkhound,elkhound.exe"