diff options
| -rw-r--r-- | tvix/cli/default.nix | 3 | ||||
| -rw-r--r-- | tvix/eval/src/compiler/mod.rs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tvix/cli/default.nix b/tvix/cli/default.nix index b6719d4e78..a4bb19701f 100644 --- a/tvix/cli/default.nix +++ b/tvix/cli/default.nix @@ -28,6 +28,9 @@ in eval-nixpkgs-stdenv-drvpath = (mkNixpkgsEvalCheck "stdenv.drvPath" pkgs.stdenv.drvPath); eval-nixpkgs-stdenv-outpath = (mkNixpkgsEvalCheck "stdenv.outPath" pkgs.stdenv.outPath); eval-nixpkgs-hello-outpath = (mkNixpkgsEvalCheck "hello.outPath" pkgs.hello.outPath); + + # This is the furthest we get starting with stdenv we hit something similar to b/261 + eval-nixpkgs-cross-gcc-outpath = (mkNixpkgsEvalCheck "pkgsCross.aarch64-multiplatform.buildPackages.gcc.outPath" pkgs.pkgsCross.aarch64-multiplatform.buildPackages.gcc.outPath); }; }; }) diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index c7061c77a0..53854c75ab 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -251,7 +251,7 @@ impl Compiler<'_> { ast::Expr::Path(path) => self.compile_path(slot, path), ast::Expr::Str(s) => self.compile_str(slot, s), - ast::Expr::UnaryOp(op) => self.compile_unary_op(slot, op), + ast::Expr::UnaryOp(op) => self.thunk(slot, op, move |c, s| c.compile_unary_op(s, op)), ast::Expr::BinOp(binop) => { self.thunk(slot, binop, move |c, s| c.compile_binop(s, binop)) |