maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(third_party/crate2nix): apply patches to fix cross

Browse source 
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
This commit is contained in:
Florian Klink 2023-10-31 14:45:29 +02:00 • committed by flokli
parent 5a0ae8312c
commit ceca00a866
4 changed files with 70 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
third_party/overlays/tvl.nix vendored
View file

@ -108,12 +108,15 @@ depot.nix.readTree.drvTargets {
};
}));
# Apply a patch to run tests in debug, not release mode.
crate2nix = super.crate2nix.overrideAttrs (old: rec {
patches = old.patches ++ [
# run tests in debug mode, not release mode
# https://github.com/nix-community/crate2nix/pull/301
./patches/crate2nix-tests-debug.patch
# https://github.com/nix-community/crate2nix/pull/309
./patches/crate2nix-take-lndir-from-buildPackages.patch
./patches/crate2nix-skip-running-tests-when-cross-compiling.patch
];
});