diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index e862d930..e3ea265e 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -20,8 +20,9 @@ jobs: os: ubuntu-latest - target: i686-unknown-linux-musl os: ubuntu-latest - - target: i686-w64-mingw32 - os: ubuntu-latest + # FIXME + # - target: i686-w64-mingw32 + # os: ubuntu-latest - target: x86_64-apple-darwin os: macos-13 - target: x86_64-unknown-linux-musl diff --git a/default.nix b/default.nix index 202437ae..07574b2b 100644 --- a/default.nix +++ b/default.nix @@ -2,8 +2,9 @@ let pkgs = import ( - if isNull target then { } - else { crossSystem.config = target; } + if isNull target then { } else { + crossSystem = { isStatic = true; config = target; }; + } ); inherit (pkgs) lib hostPlatform; diff --git a/shell.nix b/shell.nix index a8435481..ddf2bff6 100644 --- a/shell.nix +++ b/shell.nix @@ -1,14 +1,8 @@ -{ pkgs ? import { - overlays = [ - (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) - ]; - } -}: - -let - package = import ./default.nix { inherit pkgs; }; -in +{ pkgs ? import { } }: pkgs.mkShell { - inputsFrom = [ package ]; + buildInputs = with pkgs; [ + nixd + nixpkgs-fmt + ]; }