beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-11-22 02:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix ci macos version

Browse source
This commit is contained in:
Clément DOUIN 2024-09-04 11:38:46 +02:00
parent afd7d79e41
commit 74ec31014c
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
2 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.github/workflows/test.yml vendored
View file

@ -17,23 +17,23 @@ jobs:
- target: x86_64-windows - target: x86_64-windows
os: ubuntu-latest os: ubuntu-latest
- target: x86_64-darwin - target: x86_64-darwin
os: macos-latest os: macos-13
# FIXME: build broken - target: aarch64-darwin
# - target: aarch64-darwin os: macos-14
# os: macos-latest
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v24 uses: cachix/install-nix-action@v27
with: with:
nix_path: nixpkgs=channel:nixos-23.11 nix_path: nixpkgs=channel:nixos-24.05
extra_nix_config: | enable_kvm: true
experimental-features = nix-command flakes extra_nix_config: "experimental-features = nix-command flakes"
- uses: cachix/cachix-action@v12 - uses: cachix/cachix-action@v15
with: with:
name: soywod name: soywod
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
extraPullNames: nix-community
- name: Run app - name: Run app
run: | run: |
nix build -L .#${{ matrix.target }} nix build -L .#${{ matrix.target }}

17
flake.nix
View file

@ -112,23 +112,6 @@
NIX_LDFLAGS = "-F${AppKit}/Library/Frameworks -framework AppKit"; 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}" ];
};
};
}; };
}; };