grain.social is a photo sharing platform built on atproto.

fix: bring back rust-overlay for cross-compilation

Changed files
+42 -6
cli
+22 -1
cli/flake.lock
··· 53 53 "inputs": { 54 54 "crane": "crane", 55 55 "flake-utils": "flake-utils", 56 - "nixpkgs": "nixpkgs" 56 + "nixpkgs": "nixpkgs", 57 + "rust-overlay": "rust-overlay" 58 + } 59 + }, 60 + "rust-overlay": { 61 + "inputs": { 62 + "nixpkgs": [ 63 + "nixpkgs" 64 + ] 65 + }, 66 + "locked": { 67 + "lastModified": 1754534980, 68 + "narHash": "sha256-8cAquqasyPRvgJfKVKxz+gQ+SRoRxiHhX91Avtl9Rn8=", 69 + "owner": "oxalica", 70 + "repo": "rust-overlay", 71 + "rev": "89e92794124b93bddb5f8f92485ed924bd179287", 72 + "type": "github" 73 + }, 74 + "original": { 75 + "owner": "oxalica", 76 + "repo": "rust-overlay", 77 + "type": "github" 57 78 } 58 79 }, 59 80 "systems": {
+20 -5
cli/flake.nix
··· 8 8 url = "github:ipetkov/crane"; 9 9 inputs.nixpkgs.follows = "nixpkgs"; 10 10 }; 11 + rust-overlay = { 12 + url = "github:oxalica/rust-overlay"; 13 + inputs.nixpkgs.follows = "nixpkgs"; 14 + }; 11 15 }; 12 16 13 - outputs = { self, nixpkgs, flake-utils, crane }: 17 + outputs = { self, nixpkgs, flake-utils, crane, rust-overlay }: 14 18 flake-utils.lib.eachDefaultSystem (system: 15 19 let 16 - pkgs = import nixpkgs { inherit system; }; 20 + overlays = [ (import rust-overlay) ]; 21 + pkgs = import nixpkgs { inherit system overlays; }; 22 + 23 + rustToolchain = pkgs.rust-bin.stable.latest.default.override { 24 + extensions = [ "rust-src" ]; 25 + targets = [ 26 + "x86_64-unknown-linux-gnu" 27 + "x86_64-pc-windows-gnu" 28 + "x86_64-apple-darwin" 29 + "aarch64-apple-darwin" 30 + "aarch64-unknown-linux-gnu" 31 + ]; 32 + }; 17 33 18 - craneLib = crane.mkLib pkgs; 34 + craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; 19 35 20 36 src = craneLib.cleanCargoSource (craneLib.path ./.); 21 37 ··· 64 80 devShells.default = pkgs.mkShell { 65 81 inputsFrom = [ self.packages.${system}.default ]; 66 82 packages = with pkgs; [ 67 - rustc 68 - cargo 83 + rustToolchain 69 84 pkg-config 70 85 openssl 71 86 cargo-cross