From b6ac0dce84e853e42065ddc4aef71c5dc94b9e3b Mon Sep 17 00:00:00 2001 From: thedavidmeister Date: Tue, 23 Jan 2024 20:23:48 +0400 Subject: [PATCH] install rust via nix for tauri build --- .github/workflows/tauri-release.yml | 14 +++++++++++--- flake.nix | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tauri-release.yml b/.github/workflows/tauri-release.yml index 1e6ba76e2..4a14d20f7 100644 --- a/.github/workflows/tauri-release.yml +++ b/.github/workflows/tauri-release.yml @@ -14,7 +14,12 @@ jobs: strategy: fail-fast: false matrix: - platform: [macos-latest, ubuntu-20.04, windows-latest] + platform: [ + macos-latest, + ubuntu-20.04 + # Someone who cares can make windows work. + # windows-latest + ] runs-on: ${{ matrix.platform }} steps: @@ -35,8 +40,11 @@ jobs: with: node-version: 20 - - name: install Rust stable - uses: dtolnay/rust-toolchain@stable + - name: install rust + run: nix profile install .#rust-toolchain.$(nix eval --impure --raw --expr 'builtins.currentSystem') + + # - name: install Rust stable + # uses: dtolnay/rust-toolchain@stable - name: install dependencies (ubuntu only) if: matrix.platform == 'ubuntu-20.04' diff --git a/flake.nix b/flake.nix index d34acc2b7..5471d0e11 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,7 @@ let pkgs = rainix.pkgs.${system}; in { + rust-toolchain = rainix.rust-toolchain.${system}; packages = rec { ob-tauri-prelude = rainix.mkTask.${system} { name = "ob-tauri-prelude";