lol

distant: fix on aarch64-linux, modernize (#386217)

authored by

Nick Cao and committed by
GitHub
3f03580b 5290d344

+13 -7
+13 -7
pkgs/by-name/di/distant/package.nix
··· 6 6 pkg-config, 7 7 openssl, 8 8 zlib, 9 + writableTmpDirAsHomeHook, 9 10 versionCheckHook, 10 11 nix-update-script, 11 12 }: 12 13 13 - rustPlatform.buildRustPackage rec { 14 + rustPlatform.buildRustPackage (finalAttrs: { 14 15 pname = "distant"; 15 16 version = "0.20.0"; 16 17 17 18 src = fetchFromGitHub { 18 19 owner = "chipsenkbeil"; 19 20 repo = "distant"; 20 - tag = "v${version}"; 21 + tag = "v${finalAttrs.version}"; 21 22 hash = "sha256-DcnleJUAeYg3GSLZljC3gO9ihiFz04dzT/ddMnypr48="; 22 23 }; 24 + 25 + # error: linker `aarch64-linux-gnu-gcc` not found 26 + postPatch = '' 27 + rm .cargo/config.toml 28 + ''; 23 29 24 30 useFetchCargoVendor = true; 25 31 cargoHash = "sha256-HEyPfkusgk8JEYAzIS8Zj5EU0MK4wt4amlsJqBEG/Kc="; ··· 37 43 OPENSSL_NO_VENDOR = true; 38 44 }; 39 45 40 - preCheck = '' 41 - export HOME=$(mktemp -d) 42 - ''; 46 + nativeCheckInputs = [ 47 + writableTmpDirAsHomeHook 48 + ]; 43 49 44 50 checkFlags = 45 51 [ ··· 72 78 meta = { 73 79 description = "Library and tooling that supports remote filesystem and process operations"; 74 80 homepage = "https://github.com/chipsenkbeil/distant"; 75 - changelog = "https://github.com/chipsenkbeil/distant/blob/${version}/CHANGELOG.md"; 81 + changelog = "https://github.com/chipsenkbeil/distant/blob/${finalAttrs.version}/CHANGELOG.md"; 76 82 # From the README: 77 83 # "This project is licensed under either of Apache License, Version 2.0, MIT license at your option." 78 84 license = lib.licenses.mit; 79 85 maintainers = with lib.maintainers; [ GaetanLepage ]; 80 86 mainProgram = "distant"; 81 87 }; 82 - } 88 + })