From 01f8ef15604642505e9618e66184e9d83be1f6b6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 13 Apr 2024 13:50:01 +0300 Subject: fix(tvix): apply cbtemulator patch in tvix view This tells josh to include the patch from third_party/overlays/patches/cbtemulator-uds.patch at nixpkgs/cbtemulator-uds.patch. We then use the `additionalOverlays` feature introduced earlier, and pass it an overlay adding the patch to `cbtemulator`. This only gets applied if tvix/shell.nix is not called with a pkgs argument, which is the case in the tvix view. Change-Id: I7bc5543460ddd30325ab0998e891c15fcaf8bcfe Reviewed-on: https://cl.tvl.fyi/c/depot/+/11408 Tested-by: BuildkiteCI Reviewed-by: raitobezarius Autosubmit: flokli --- views/tvix/workspace.josh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'views/tvix/workspace.josh') diff --git a/views/tvix/workspace.josh b/views/tvix/workspace.josh index 58c83f861b..57d5f8a8c4 100644 --- a/views/tvix/workspace.josh +++ b/views/tvix/workspace.josh @@ -1,8 +1,9 @@ :/third_party:[ - ::nixpkgs/ + ::nixpkgs/, ::sources/ ] ::tvix:exclude[ ::tvix/default.nix ::tvix/**/default.nix:exclude[::tvix/eval/src/tests/tvix_tests/directory/default.nix] ]:/tvix +::third_party/overlays/patches/cbtemulator-uds.patch:/third_party/overlays/patches:prefix=nixpkgs -- cgit 1.4.1