dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #214137 from wegank/zenith-darwin

Browse Source 
zenith: unbreak on aarch64 platforms
This commit is contained in:
Weijia Wang 2023-02-02 10:55:10 +01:00 committed by GitHub
commit 99a3d691c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/system/zenith/default.nix
View File

@ -8,6 +8,8 @@
, llvmPackages , llvmPackages
}: }:
assert nvidiaSupport -> stdenv.isLinux;
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "zenith"; pname = "zenith";
version = "0.13.1"; version = "0.13.1";
@ -19,6 +21,11 @@ rustPlatform.buildRustPackage rec {
sha256 = "sha256-N/DvPVYGM/DjTvKvOlR60q6rvNyfAQlnvFnFG5nbUmQ="; sha256 = "sha256-N/DvPVYGM/DjTvKvOlR60q6rvNyfAQlnvFnFG5nbUmQ=";
}; };
# remove cargo config so it can find the linker on aarch64-linux
postPatch = ''
rm .cargo/config
'';
cargoSha256 = "sha256-Y/vvRJpv82Uc+Bu3lbZxRsu4TL6sAjz5AWHAHkwh98Y="; cargoSha256 = "sha256-Y/vvRJpv82Uc+Bu3lbZxRsu4TL6sAjz5AWHAHkwh98Y=";
nativeBuildInputs = [ llvmPackages.clang ] ++ lib.optional nvidiaSupport makeWrapper; nativeBuildInputs = [ llvmPackages.clang ] ++ lib.optional nvidiaSupport makeWrapper;
@ -39,8 +46,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/bvaisvil/zenith"; homepage = "https://github.com/bvaisvil/zenith";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ bbigras ]; maintainers = with maintainers; [ bbigras ];
# doesn't build on aarch64 https://github.com/bvaisvil/zenith/issues/19 platforms = platforms.unix;
# see https://github.com/NixOS/nixpkgs/pull/88616
platforms = platforms.x86;
}; };
} }