From 4fb7ff93db11434074647e3a8af3b6ec2035343c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Sat, 23 Nov 2024 13:41:43 +0100 Subject: [PATCH] adjust crossSystem condition --- .github/workflows/pre-release.yml | 5 ----- default.nix | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 4b2cadb6..814056c5 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -36,13 +36,8 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' extraPullNames: nix-community - name: Build release - if: ${{ matrix.target }} != "" run: | nix-build --arg crossSystem '{ config = "${{ matrix.target }}"; }' - - name: Build release - if: ${{ matrix.target }} == "" - run: | - nix-build - name: Upload release artifacts uses: actions/upload-artifact@v4 with: diff --git a/default.nix b/default.nix index 3f39912e..0fe3a3ed 100644 --- a/default.nix +++ b/default.nix @@ -2,7 +2,7 @@ { crossSystem ? null }: let - crossBuildEnabled = !isNull crossSystem; + crossBuildEnabled = crossSystem != null && crossSystem != ""; crossSystems = import ./cross-systems.nix; buildPkgs = import { };