From 0b688c82e8624999631745b1425cb98a083ddb76 Mon Sep 17 00:00:00 2001 From: IGI-111 Date: Mon, 27 May 2024 03:42:28 +0400 Subject: [PATCH] Enable darwin target --- .github/workflows/nix-github-actions.yml | 4 ++-- flake.lock | 11 ++++++----- flake.nix | 22 +++++++++++++++++----- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.github/workflows/nix-github-actions.yml b/.github/workflows/nix-github-actions.yml index 7d329e8..3dc0069 100644 --- a/.github/workflows/nix-github-actions.yml +++ b/.github/workflows/nix-github-actions.yml @@ -14,7 +14,7 @@ jobs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v24 + - uses: cachix/install-nix-action@v27 - id: set-matrix name: Generate Nix Matrix run: | @@ -29,5 +29,5 @@ jobs: matrix: ${{fromJSON(needs.nix-matrix.outputs.matrix)}} steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v24 + - uses: cachix/install-nix-action@v27 - run: nix build -L ".#${{ matrix.attr }}" diff --git a/flake.lock b/flake.lock index c266a07..49c7d3b 100644 --- a/flake.lock +++ b/flake.lock @@ -45,15 +45,16 @@ ] }, "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", - "owner": "nix-community", + "lastModified": 1716823556, + "narHash": "sha256-xe91WnzDwGrnY2O992hK1Frq9bpj+NMvl43BtjX/UJs=", + "owner": "IGI-111", "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", + "rev": "878fcd535257a2fd22d5d1e95cd4b447bb94ca94", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "IGI-111", + "ref": "IGI-111/add-aarch64-darwin", "repo": "nix-github-actions", "type": "github" } diff --git a/flake.nix b/flake.nix index 6a55c79..ada2085 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ flake-utils.url = "github:numtide/flake-utils"; crane.url = "github:ipetkov/crane"; crane.inputs.nixpkgs.follows = "nixpkgs"; - nix-github-actions.url = "github:nix-community/nix-github-actions"; + nix-github-actions.url = "github:IGI-111/nix-github-actions?ref=IGI-111/add-aarch64-darwin"; nix-github-actions.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = @@ -112,7 +112,16 @@ inherit pkgs; buildInputs = with pkgs; [ openssl - darwin.libicov + darwin.libiconv + darwin.libobjc + # darwin.xcode + # darwin.apple_sdk.sdk + darwin.apple_sdk.Libsystem + # darwin.apple_sdk.frameworks + darwin.apple_sdk.frameworks.SystemConfiguration + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Cocoa ]; nativeBuildInputs = with pkgs; [ rustc @@ -123,6 +132,7 @@ slint-lsp pkg-config + toybox ]; }; }; @@ -130,7 +140,9 @@ { githubActions = nix-github-actions.lib.mkGithubMatrix { inherit (self) checks; }; } - // flake-utils.lib.eachSystem [ "x86_64-linux" ] ( - system: buildPackageForSystem buildPackageDeps."${system}" - ); + // flake-utils.lib.eachSystem [ + "x86_64-linux" + # "x86_64-darwin" + "aarch64-darwin" + ] (system: buildPackageForSystem buildPackageDeps."${system}"); }