ceca00a866
Together with temporarily pointing nixpkgs past b10994c38c61038970a19fa60bfbec21a61755cc, this now fixes cross- compilation for tvix. This incorporates the changes proposed in https://cl.tvl.fyi/9888 and https://cl.tvl.fyi/9889, but by fixing it in crate2nix, and using the (re-)generated version of it. Changes were sent upstream at https://github.com/nix-community/crate2nix/pull/309, this pulls in a minimal patch for now. Change-Id: I70bb6f003bbc3e89de9c4eb4985ea4708ac3a9fd Reviewed-on: https://cl.tvl.fyi/c/depot/+/9890 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From b37dff98b7df177313f2823a77c19828398f1505 Mon Sep 17 00:00:00 2001
|
|
From: Florian Klink <flokli@flokli.de>
|
|
Date: Tue, 31 Oct 2023 14:18:06 +0200
|
|
Subject: [PATCH] skip running tests when cross-compiling
|
|
|
|
---
|
|
crate2nix/templates/nix/crate2nix/default.nix | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/crate2nix/templates/nix/crate2nix/default.nix b/crate2nix/templates/nix/crate2nix/default.nix
|
|
index 2b8050c..e4fc2e9 100644
|
|
--- a/templates/nix/crate2nix/default.nix
|
|
+++ b/templates/nix/crate2nix/default.nix
|
|
@@ -165,10 +165,12 @@ rec {
|
|
passthru = (crate.passthru or { }) // {
|
|
inherit test;
|
|
};
|
|
- } ''
|
|
- echo tested by ${test}
|
|
- ${lib.concatMapStringsSep "\n" (output: "ln -s ${crate.${output}} ${"$"}${output}") crate.outputs}
|
|
- '';
|
|
+ }
|
|
+ (lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
|
+ echo tested by ${test}
|
|
+ '' + ''
|
|
+ ${lib.concatMapStringsSep "\n" (output: "ln -s ${crate.${output}} ${"$"}${output}") crate.outputs}
|
|
+ '');
|
|
|
|
/* A restricted overridable version of builtRustCratesWithFeatures. */
|
|
buildRustCrateWithFeatures =
|
|
--
|
|
2.42.0
|
|
|