From 6d15f89453891d4b8d02cce521b35a8b09c834b5 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 12:00:53 +0300 Subject: [PATCH 1/2] hawkeye: switch to fetchCargoVendor --- pkgs/by-name/ha/hawkeye/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ha/hawkeye/package.nix b/pkgs/by-name/ha/hawkeye/package.nix index 36d883ccdc56..6ffc0cc3f428 100644 --- a/pkgs/by-name/ha/hawkeye/package.nix +++ b/pkgs/by-name/ha/hawkeye/package.nix @@ -16,7 +16,8 @@ rustPackages.rustPlatform.buildRustPackage rec { hash = "sha256-VfJWj9BwNVR7RVUW+CjFuaniyiEath1U0F/7QJcA3r4="; }; - cargoHash = "sha256-tTXoxWjcTtEcRcuSs0ewCN1VJYmTIKRgL3s7QSYt7sk="; + useFetchCargoVendor = true; + cargoHash = "sha256-SJEl5QsO4KYRv+5xDPHy1Q53qcL89IJ9JTXtzubO5fk="; nativeBuildInputs = [ pkg-config From 8c76cbea6a534bae8a5c9ebfa830c714ef319725 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 14 Feb 2025 12:01:41 +0300 Subject: [PATCH 2/2] llvmPackages.libc: rename shim .so to .tpl This makes it not get deleted with cleanSource. --- pkgs/development/compilers/llvm/common/libc/default.nix | 2 +- .../compilers/llvm/common/libc/{libc-shim.so => libc-shim.tpl} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/compilers/llvm/common/libc/{libc-shim.so => libc-shim.tpl} (100%) diff --git a/pkgs/development/compilers/llvm/common/libc/default.nix b/pkgs/development/compilers/llvm/common/libc/default.nix index f57239b7a978..2ba098da2814 100644 --- a/pkgs/development/compilers/llvm/common/libc/default.nix +++ b/pkgs/development/compilers/llvm/common/libc/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { ''; postInstall = lib.optionalString (!isFullBuild) '' - substituteAll ${./libc-shim.so} $out/lib/libc.so + substituteAll ${./libc-shim.tpl} $out/lib/libc.so ''; libc = if (!isFullBuild) then stdenv.cc.libc else null; diff --git a/pkgs/development/compilers/llvm/common/libc/libc-shim.so b/pkgs/development/compilers/llvm/common/libc/libc-shim.tpl similarity index 100% rename from pkgs/development/compilers/llvm/common/libc/libc-shim.so rename to pkgs/development/compilers/llvm/common/libc/libc-shim.tpl