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 --- tvix/shell.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tvix/shell.nix') diff --git a/tvix/shell.nix b/tvix/shell.nix index 75e64b88b2f9..422f1c8dd40a 100644 --- a/tvix/shell.nix +++ b/tvix/shell.nix @@ -8,7 +8,16 @@ pkgs ? (import ./nixpkgs { depotOverlays = false; depot.third_party.sources = import ./sources { }; - additionalOverlays = [ ]; + additionalOverlays = [ + (self: super: { + # https://github.com/googleapis/google-cloud-go/pull/9665 + cbtemulator = super.cbtemulator.overrideAttrs (old: { + patches = old.patches or [ ] ++ [ + ./nixpkgs/cbtemulator-uds.patch + ]; + }); + }) + ]; }) , ... }: -- cgit 1.4.1