mirror of
https://github.com/soywod/himalaya.git
synced 2024-11-21 18:40:19 +00:00
fix ci macos version
This commit is contained in:
parent
afd7d79e41
commit
74ec31014c
2 changed files with 9 additions and 26 deletions
18
.github/workflows/test.yml
vendored
18
.github/workflows/test.yml
vendored
|
@ -17,23 +17,23 @@ jobs:
|
|||
- target: x86_64-windows
|
||||
os: ubuntu-latest
|
||||
- target: x86_64-darwin
|
||||
os: macos-latest
|
||||
# FIXME: build broken
|
||||
# - target: aarch64-darwin
|
||||
# os: macos-latest
|
||||
os: macos-13
|
||||
- target: aarch64-darwin
|
||||
os: macos-14
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
- name: Install Nix
|
||||
uses: cachix/install-nix-action@v24
|
||||
uses: cachix/install-nix-action@v27
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixos-23.11
|
||||
extra_nix_config: |
|
||||
experimental-features = nix-command flakes
|
||||
- uses: cachix/cachix-action@v12
|
||||
nix_path: nixpkgs=channel:nixos-24.05
|
||||
enable_kvm: true
|
||||
extra_nix_config: "experimental-features = nix-command flakes"
|
||||
- uses: cachix/cachix-action@v15
|
||||
with:
|
||||
name: soywod
|
||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||
extraPullNames: nix-community
|
||||
- name: Run app
|
||||
run: |
|
||||
nix build -L .#${{ matrix.target }}
|
||||
|
|
17
flake.nix
17
flake.nix
|
@ -112,23 +112,6 @@
|
|||
NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit";
|
||||
};
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
rustTarget = "x86_64-apple-darwin";
|
||||
runner = { pkgs, himalaya }: "${pkgs.qemu}/bin/qemu-x86_64 ${himalaya}";
|
||||
mkPackage = { system, pkgs }: package:
|
||||
let
|
||||
inherit ((mkPkgsCross system "x86_64-apple-darwin").pkgsStatic) stdenv darwin;
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
|
||||
cc = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
|
||||
in
|
||||
package // {
|
||||
buildInputs = [ Cocoa ];
|
||||
NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit";
|
||||
TARGET_CC = cc;
|
||||
CARGO_BUILD_RUSTFLAGS = package.CARGO_BUILD_RUSTFLAGS ++ [ "-Clinker=${cc}" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue