new strategy to build

Author: paulchambaz

flake.nix

@@ -3,26 +3,19 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
   };
-
-  outputs =
-    {
-      self,
-      nixpkgs,
-      flake-utils,
-    }:
+  outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachDefaultSystem (
       system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
-
         buildPkgs = with pkgs; [
           pkg-config
           templ
           scdoc
           go
           tailwindcss_4
+          zig  # Add Zig
         ];
-
         devPkgs = with pkgs; [
           just
           air
@@ -32,33 +25,39 @@
           hivemind
           watchman
         ];
-
-        mkPolybase =
-          os:
+        mkPolybase = os:
           pkgs.buildGoModule {
             pname = "polybase";
             version = "0.1.0";
             src = ./.;
             vendorHash = "sha256-l5RNYoXMVAUeI96lTO0who2uje3IrlycD2GpCDFX3F0=";
-
             nativeBuildInputs = buildPkgs;
-
+            
             postPatch = ''
               tailwindcss -i static/css/main.css -o static/css/styles.css -m
               templ generate
             '';
-
+            
+            preBuild = ''
+              export CGO_ENABLED=1
+              export GOOS=${os}
+              export GOARCH=amd64
+              
+              export CC="zig cc -target x86_64-${os}"
+              export CXX="zig c++ -target x86_64-${os}"
+            '';
+            
             buildPhase = ''
               go test ./tests/...
-
-              export GOOS=${os} GOARCH=amd64 CGO_ENABLED=0
+              
               mkdir -p bin
               go build -o bin/polybased ./polybased
               go build -o bin/polybase ./polybase
+              
               scdoc < polybase.1.scd | sed "s/1980-01-01/$(date '+%B %Y')/" > polybase.1
               scdoc < polybased.1.scd | sed "s/1980-01-01/$(date '+%B %Y')/" > polybased.1
             '';
-
+            
             installPhase = ''
               mkdir -p $out/dist/{usr/local/bin,usr/local/man/man1,etc/rc.d}
               cp bin/polybased bin/polybase $out/dist/usr/local/bin/
@@ -71,25 +70,19 @@
       {
         packages = {
           default = mkPolybase "openbsd";
-
           docker = pkgs.dockerTools.buildImage {
             name = "polybase";
             tag = "latest";
-
             extraCommands = ''
               mkdir -p var/lib/polybase var/log/polybase etc/polybase
-
               find ${./.}/migrations -name "*.sql" | \
                 sort -n | \
                 xargs cat | \
                 ${pkgs.sqlite}/bin/sqlite3 var/lib/polybase/polybase.db
-
               chmod 755 var/lib/polybase var/log/polybase
               chmod 644 var/lib/polybase/polybase.db
-
               touch etc/polybase/polybase.cfg
             '';
-
             config = {
               Cmd = [ "${mkPolybase "linux"}/dist/usr/local/bin/polybased" ];
               ExposedPorts = {
@@ -101,7 +94,6 @@
             };
           };
         };
-
         devShell = pkgs.mkShell {
           nativeBuildInputs = buildPkgs;
           buildInputs = devPkgs;