Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
rvolosatovs committed Aug 11, 2023
1 parent 667dd92 commit 3d22390
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 3 deletions.
17 changes: 17 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
inputs.crane.inputs.rust-overlay.follows = "rust-overlay";
inputs.crane.url = github:ipetkov/crane;
inputs.fenix.inputs.nixpkgs.follows = "nixpkgs";
inputs.fenix.url = github:nix-community/fenix;
inputs.fenix.url = github:nix-community/fenix;
inputs.flake-utils.url = github:numtide/flake-utils;
inputs.macos-sdk.url = github:hexops-graveyard/sdk-macos-12.0;
inputs.macos-sdk.flake = false;
inputs.nix-filter.url = github:numtide/nix-filter;
inputs.nix-log.url = github:rvolosatovs/nix-log;
inputs.nixlib.url = github:nix-community/nixpkgs.lib;
Expand Down
5 changes: 3 additions & 2 deletions lib/rust/mkAttrs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
self,
crane,
flake-utils,
nixlib,
macos-sdk,
nix-log,
nixlib,
...
}:
with flake-utils.lib.system;
Expand Down Expand Up @@ -346,7 +347,7 @@ with self.lib.rust.targets;
// optionalAttrs pkgsCross.stdenv.hostPlatform.isDarwin {
preBuild = ''
export HOME=$(mktemp -d)
export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
export SDKROOT="${macos-sdk}/root"
'';

"CARGO_TARGET_${toUpper (kebab2snake target)}_LINKER" = "${target}-zigcc";
Expand Down

0 comments on commit 3d22390

Please sign in to comment.