avoid IFD, fix patch

This commit is contained in:
Linus Heckemann 2024-10-05 16:29:41 +02:00
parent bb40996c4b
commit e4aa3b2aec

View file

@ -11,22 +11,25 @@ rustPlatform.buildRustPackage rec {
inherit pname;
version = "0.1.0";
src = fetchgit {
src = builtins.fetchGit {
name = "tvix";
url = "https://code.tvl.fyi/depot.git";
rev = "e97202e54a02d0717f0457fec0863e3e74fc93d8";
hash = "sha256-V/3vSjLp28hv1vJowvy9NlBp7gV6GayHzj4iUN6dek0=";
};
patches = [
(fetchpatch {
url = "https://cl.tvl.fyi/changes/depot~12015/revisions/1/patch?download";
url = "https://cl.tvl.fyi/changes/depot~12016/revisions/1/patch?download";
decode = "base64 -d";
hash = "sha256-2KHXwLp5unhC8albVT6Cimw2zZCes93lDdM5jckvxd0=";
hash = "sha256-ldIZkkbtYYAPHK62eYnYVudrZCdBqTIg3V27IutFPAA=";
})
];
postPatch = "cd tvix";
preBuild = ''
export PROTO_ROOT=$(realpath $PWD/..)
'';
doCheck = false;
cargoBuildFlags = builtins.concatStringsSep " " (
@ -39,8 +42,6 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ protobuf ];
PROTO_ROOT = "/build/${src.name}";
cargoLock = {
lockFile = src + "/tvix/Cargo.lock";
allowBuiltinFetchGit = true;