about summary refs log tree commit diff
diff options
context:
space:
mode:
authorIlan Joselevich <personal@ilanjoselevich.com>2024-06-17T13·23+0300
committerIlan Joselevich <personal@ilanjoselevich.com>2024-06-17T14·34+0000
commit210b4277b6d25c742174d74a13ad5b4313b83955 (patch)
tree8cff31f265e30e85a796714c62a35682571ddd68
parentfbe29615df785c91b8501690c90fa2728a7195f5 (diff)
chore(tvix): Use callPackage instead of import on Cargo.nix r/8291
Since crate2nix v0.11 the new preferred way of importing Cargo.nix is
with callPackage instead of import.

Change-Id: Ifcc5c21e6c101cb9d0b3f1e8025b5ddb8cf99f20
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11855
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
-rw-r--r--tvix/default.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/tvix/default.nix b/tvix/default.nix
index 98e9fd01e83b..d082e955daaa 100644
--- a/tvix/default.nix
+++ b/tvix/default.nix
@@ -32,10 +32,7 @@ let
     };
 
   # Load the crate2nix crate tree.
-  crates = import ./Cargo.nix {
-    inherit pkgs;
-    nixpkgs = pkgs.path;
-
+  crates = pkgs.callPackage ./Cargo.nix {
     defaultCrateOverrides = pkgs.defaultCrateOverrides // {
       zstd-sys = prev: {
         nativeBuildInputs = prev.nativeBuildInputs or [ ];