fix macos trial 1

This commit is contained in:
Clément DOUIN
2024-11-25 15:59:09 +01:00
parent a38897d880
commit 49de48151b
4 changed files with 14 additions and 9 deletions
+7 -4
View File
@@ -10,9 +10,12 @@ jobs:
fail-fast: false
matrix:
include:
# - system: aarch64-macos
# target: aarch64-apple-darwin
# os: macos-latest
- system: aarch64-macos-14
target: aarch64-apple-darwin
os: macos-14
- system: aarch64-macos-15
target: aarch64-apple-darwin
os: macos-15
# - system: aarch64-linux
# target: aarch64-unknown-linux-musl
# os: ubuntu-latest
@@ -30,7 +33,7 @@ jobs:
# os: ubuntu-latest
- system: x86_64-macos
target: x86_64-apple-darwin
os: macos-latest
os: macos-13
# - system: x86_64-linux
# target: x86_64-unknown-linux-musl
# os: ubuntu-latest
+3 -3
View File
@@ -7,10 +7,10 @@ let
systems = import ./systems.nix;
system = systems.${target};
buildPackages = import (fetchTarball "https://github.com/soywod/nixpkgs/archive/master.tar.gz") { };
buildPackages = import (fetchTarball "https://github.com/nixos/nixpkgs/archive/nixos-unstable.tar.gz") { };
inherit (buildPackages) stdenv binutils mktemp gnutar zip;
pkgs = import (fetchTarball "https://github.com/soywod/nixpkgs/archive/master.tar.gz") {
pkgs = import (fetchTarball "https://github.com/nixos/nixpkgs/archive/nixos-unstable.tar.gz") {
crossSystem = {
isStatic = true;
config = target;
@@ -38,7 +38,7 @@ let
in "${(system.emulator or hostPlatform.emulator) buildPackages} ./himalaya${ext}";
himalaya = import ./package.nix {
inherit lib hostPlatform rustPlatform;
inherit lib rustPlatform;
fetchFromGitHub = pkgs.fetchFromGitHub;
stdenv = pkgs.stdenv;
darwin = pkgs.darwin;
+4 -1
View File
@@ -1,6 +1,5 @@
{ lib
, pkg-config
, hostPlatform
, rustPlatform
, fetchFromGitHub
, stdenv
@@ -29,6 +28,10 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8=";
NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
"-framework Security"
];
# unit tests only
doCheck = false;
cargoTestFlags = [ "--lib" ];
-1
View File
@@ -26,7 +26,6 @@
x86_64-apple-darwin = {
rustTarget = "x86_64-apple-darwin";
emulator = _: "";
};
x86_64-unknown-linux-musl = {