yogsototh/mach-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add darwin aarm64 check to lib overrides

Browse source
This commit is contained in:
jared-w 2022-02-01 16:01:07 -08:00
parent c7b793ffb7
commit 59275df11a
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mach_nix/nix/conda-channels.nix
View file

@ -17,6 +17,7 @@ let
systemMap = { systemMap = {
x86_64-linux = "linux-64"; x86_64-linux = "linux-64";
x86_64-darwin = "osx-64"; x86_64-darwin = "osx-64";
aarch64-darwin = "osx-arm64";
aarch64-linux = "linux-aarch64"; aarch64-linux = "linux-aarch64";
}; };

2
mach_nix/nix/lib.nix
View file

@ -179,7 +179,7 @@ rec {
file = "${compileExpression args}/share/mach_nix_file.nix"; file = "${compileExpression args}/share/mach_nix_file.nix";
result = import file { inherit (args) pkgs python; }; result = import file { inherit (args) pkgs python; };
manylinux = manylinux =
if args.pkgs.stdenv.hostPlatform.system == "x86_64-darwin" then if builtins.elem args.pkgs.stdenv.hostPlatform.system [ "x86_64-darwin" "aarch64-darwin" ] then
[] []
else else
args.pkgs.pythonManylinuxPackages.manylinux1; args.pkgs.pythonManylinuxPackages.manylinux1;