b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #233564 from wegank/debug-only

Browse source 
python310Packages.jaxlib: unbreak on aarch64-linux
This commit is contained in:
Weijia Wang 2023-05-23 12:04:11 +03:00 committed by GitHub
parent 8bf5fb4770 afdb1e0d7d
commit 7c5d126b21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/python-modules/jaxlib/default.nix
View file

@ -63,7 +63,7 @@ let
# aarch64-darwin is broken because of https://github.com/bazelbuild/rules_cc/pull/136 # aarch64-darwin is broken because of https://github.com/bazelbuild/rules_cc/pull/136
# however even with that fix applied, it doesn't work for everyone: # however even with that fix applied, it doesn't work for everyone:
# https://github.com/NixOS/nixpkgs/pull/184395#issuecomment-1207287129 # https://github.com/NixOS/nixpkgs/pull/184395#issuecomment-1207287129
broken = stdenv.isAarch64 || stdenv.isDarwin; broken = stdenv.isDarwin;
}; };
cudatoolkit_joined = symlinkJoin { cudatoolkit_joined = symlinkJoin {
@ -129,6 +129,11 @@ let
"zlib" "zlib"
]; ];
arch =
# KeyError: ('Linux', 'arm64')
if stdenv.targetPlatform.isLinux && stdenv.targetPlatform.linuxArch == "arm64" then "aarch64"
else stdenv.targetPlatform.linuxArch;
bazel-build = buildBazelPackage rec { bazel-build = buildBazelPackage rec {
name = "bazel-build-${pname}-${version}"; name = "bazel-build-${pname}-${version}";
@ -291,7 +296,7 @@ let
'' else throw "Unsupported stdenv.cc: ${stdenv.cc}"); '' else throw "Unsupported stdenv.cc: ${stdenv.cc}");
installPhase = '' installPhase = ''
./bazel-bin/build/build_wheel --output_path=$out --cpu=${stdenv.targetPlatform.linuxArch} ./bazel-bin/build/build_wheel --output_path=$out --cpu=${arch}
''; '';
}; };
@ -299,11 +304,11 @@ let
}; };
platformTag = platformTag =
if stdenv.targetPlatform.isLinux then if stdenv.targetPlatform.isLinux then
"manylinux2014_${stdenv.targetPlatform.linuxArch}" "manylinux2014_${arch}"
else if stdenv.system == "x86_64-darwin" then else if stdenv.system == "x86_64-darwin" then
"macosx_10_9_${stdenv.targetPlatform.linuxArch}" "macosx_10_9_${arch}"
else if stdenv.system == "aarch64-darwin" then else if stdenv.system == "aarch64-darwin" then
"macosx_11_0_${stdenv.targetPlatform.linuxArch}" "macosx_11_0_${arch}"
else throw "Unsupported target platform: ${stdenv.targetPlatform}"; else throw "Unsupported target platform: ${stdenv.targetPlatform}";
in in