build: cross-compiled binary distributions

Author: Marc Jakobi

.github/workflows/cd.yml

@@ -4,6 +4,7 @@ permissions:
   contents: write
 
 on:
+  pull_request: # TODO: remove this
   release:
     types: [published]
   workflow_dispatch:
@@ -35,18 +36,18 @@ jobs:
             os: windows-2025
           - target: aarch64-apple-darwin
             os: macos-15
-          # - target: aarch64-unknown-linux-gnu
-          #   os: ubuntu-22.04
-          # - target: aarch64-unknown-linux-musl
-          #   os: ubuntu-22.04
+          - target: aarch64-unknown-linux-gnu
+            os: ubuntu-22.04
+          - target: x86_64-unknown-linux-musl
+            os: ubuntu-22.04
+          - target: aarch64-unknown-linux-musl
+            os: ubuntu-22.04
           # - target: aarch64-pc-windows-msvc
           #   os: windows-2022
-          # - target: x86_64-apple-darwin
-          #   os: macos-13
-          # - target: x86_64-unknown-freebsd
-          #   os: ubuntu-22.04
-          # - target: x86_64-unknown-linux-musl
-          #   os: ubuntu-22.04
+          - target: x86_64-apple-darwin
+            os: macos-15
+          - target: x86_64-unknown-freebsd
+            os: ubuntu-22.04
       fail-fast: false
     timeout-minutes: 120
     runs-on: ${{ matrix.os }}
@@ -68,27 +69,13 @@ jobs:
       - name: Nix devShell
         uses: nicknovitski/nix-develop@v1.2.1
         with:
-          arguments: ".#cd"
+          arguments: ".#cd_${{ matrix.target }}"
         if: "!startsWith(matrix.os, 'windows')"
 
       - name: Install Rust Toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         if: startsWith(matrix.os, 'windows')
 
-      # NOTE: We cannot cross-compile yet because of dynamically linked dependencies:
-      # - gpgme -> lgpg-error, lgpgme
-      # - git2 -> lgit2
-      #
-      # - name: Setup cross toolchain
-      #   uses: taiki-e/setup-cross-toolchain-action@v1
-      #   with:
-      #     target: ${{ matrix.target }}
-      #   if: startsWith(matrix.os, 'ubuntu') && !contains(matrix.target, '-musl')
-      #
-      # - name: Add target via rustup
-      #   run: rustup target add ${{ matrix.target }}
-      #   if: "!endsWith(matrix.target, 'windows-msvc')"
-
       - name: "Setup environment for MSVC"
         run: echo "RUSTFLAGS=${RUSTFLAGS} -C target-feature=+crt-static" >> "${GITHUB_ENV}"
         if: endsWith(matrix.target, 'windows-msvc')

flake.lock

@@ -9,6 +9,10 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
+    nixpkgs-cross-overlay = {
+      url = "github:alekseysidorov/nixpkgs-cross-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     flake-parts.url = "github:hercules-ci/flake-parts";
     git-hooks = {
       url = "github:cachix/git-hooks.nix";
@@ -67,7 +71,6 @@
                   cargo-nextest
                   cargo-hakari
                   cargo-insta
-                  cargo-cross
                   clippy
                   taplo
                   # Needed for integration test builds
@@ -82,16 +85,41 @@
                 ++ pkgs.lux-cli.nativeBuildInputs;
             };
 
-          mkBuildShell = pkgs':
-            pkgs'.mkShell {
+          mkBuildShell = {
+            buildInputs ? [],
+            shellHook ? "",
+          }:
+            pkgs.mkShell {
               name = "lux buildShell";
               buildInputs =
-                (
-                  lib.filter
+                buildInputs
+                ++ pkgs.lux-cli.nativeBuildInputs;
+              inherit shellHook;
+            };
+
+          mkCrossBuildShell = target: let
+            crossSystem = {
+              config = target;
+              isStatic = true;
+              useLLVM = true;
+            };
+            pkgsCross = import nixpkgs {
+              localSystem = system;
+              inherit crossSystem;
+              overlays = [
+                inputs.nixpkgs-cross-overlay.overlays.default
+              ];
+            };
+          in
+            mkBuildShell
+            {
+              buildInputs =
+                [pkgsCross.rustCrossHook]
+                ++ (lib.filter
                   (pkg: !(lib.hasPrefix "lua" pkg.name))
-                  pkgs'.lux-cli.buildInputs
-                )
-                ++ pkgs'.lux-cli.nativeBuildInputs;
+                  pkgsCross.lux-cli.buildInputs)
+                ++ pkgsCross.lux-cli.nativeBuildInputs;
+              shellHook = pkgsCross.crossBashPrompt;
             };
         in rec {
           default = lua54;
@@ -100,7 +128,27 @@
           lua53 = mkDevShell [pkgs.lua5_3];
           lua54 = mkDevShell [pkgs.lua5_4];
           luajit = mkDevShell [pkgs.luajit];
-          cd = mkBuildShell pkgs;
+          cd =
+            mkBuildShell
+            {
+              buildInputs =
+                (lib.filter
+                  (pkg: !(lib.hasPrefix "lua" pkg.name))
+                  pkgs.lux-cli.buildInputs)
+                ++ pkgs.lux-cli.nativeBuildInputs;
+            };
+          cd_x86_64-unknown-linux-gnu = cd;
+          cd_aarch64-apple-darwin = cd;
+          cd_x86_64-unknown-linux-musl =
+            mkCrossBuildShell "x86_64-unknown-linux-musl";
+          cd_aarch64-unknown-linux-gnu =
+            mkCrossBuildShell "aarch64-unknown-linux-gnu";
+          cd_aarch64-unknown-linux-musl =
+            mkCrossBuildShell "aarch64-unknown-linux-musl";
+          cd_x86_64-unknown-freebsd =
+            mkCrossBuildShell "x86_64-unknown-freebsd";
+          cd_x86_64-apple-darwin =
+            mkCrossBuildShell "x86_64-apple-darwin";
         };
 
         checks = rec {