about summary refs log tree commit diff
path: root/tvix/Cargo.nix
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-10-31T12·45+0200
committerflokli <flokli@flokli.de>2023-11-02T09·32+0000
commitceca00a866f7e02b5c9c8d61cd522ea265a6eb19 (patch)
tree9a991f9f8acb10ec76a80cf29a2a445622dbdb1c /tvix/Cargo.nix
parent5a0ae8312c58fb67371c3c5961a39b9a5f9c87e6 (diff)
chore(third_party/crate2nix): apply patches to fix cross r/6922
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
Diffstat (limited to 'tvix/Cargo.nix')
-rw-r--r--tvix/Cargo.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 487a17573aed..dab411ebb863 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -11413,7 +11413,7 @@ rec {
             # recreate a file hierarchy as when running tests with cargo
 
             # the source for test data
-            ${pkgs.xorg.lndir}/bin/lndir ${crate.src}
+            ${pkgs.buildPackages.xorg.lndir}/bin/lndir ${crate.src}
 
             # build outputs
             testRoot=target/debug
@@ -11443,10 +11443,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 =