From 1f57694a6bde6c0dae93032a5c12181a8ebc7960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?= Date: Fri, 12 Jan 2024 09:35:01 +0100 Subject: [PATCH] template: add x86_64-darwin, aarch64-darwin --- templates/default/flake.nix | 52 +++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/templates/default/flake.nix b/templates/default/flake.nix index 09be26b..f1f9bde 100644 --- a/templates/default/flake.nix +++ b/templates/default/flake.nix @@ -9,28 +9,40 @@ }; outputs = { self, nixpkgs, risc0pkgs }: let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; + systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + forEachSystem = nixpkgs.lib.genAttrs systems; in { - packages.${system}.risc0package = - risc0pkgs.lib.${system}.buildRisc0Package { - pname = "risc0package"; - version = "0.0.1"; - src = ./.; - doCheck = false; - cargoSha256 = "sha256-oY52S/Yljkn9lfH8oA8+XkCwAwOaOBzIT5uLCMZZYxI="; - nativeBuildInputs = [ pkgs.makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/host \ - --set PATH ${pkgs.lib.makeBinPath [ risc0pkgs.packages.${system}.r0vm ]} - ''; - }; + packages = forEachSystem (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + risc0package = + risc0pkgs.lib.${system}.buildRisc0Package { + pname = "risc0package"; + version = "0.0.1"; + src = ./.; + doCheck = false; + cargoSha256 = "sha256-oY52S/Yljkn9lfH8oA8+XkCwAwOaOBzIT5uLCMZZYxI="; + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/host \ + --set PATH ${pkgs.lib.makeBinPath [ risc0pkgs.packages.${system}.r0vm ]} + ''; + }; + }); - devShells.${system}.default = pkgs.mkShell { - RISC0_DEV_MODE = 1; - inputsFrom = [ self.packages.${system}.risc0package ]; - nativeBuildInputs = [ risc0pkgs.packages.${system}.r0vm ]; - }; + devShells = forEachSystem (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + default = pkgs.mkShell { + RISC0_DEV_MODE = 1; + inputsFrom = [ self.packages.${system}.risc0package ]; + nativeBuildInputs = [ risc0pkgs.packages.${system}.r0vm ]; + }; + }); }; }