diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-15 02:01:03 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-15 02:01:15 +0100 |
| commit | 3b8cf433506453cfccd255021e1e52882daf4097 (patch) | |
| tree | f32ae1e138468e138615eec0f21f64c10e0742f4 /pkgs/build-support/rust | |
| parent | 231c1145f23b9e7e4477cf280212b92f46698717 (diff) | |
| parent | 1c03223e5c1cf29a349a47ddf76f14806c048852 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/imageio/default.nix - pkgs/development/python-modules/pytest-order/default.nix
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-package/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 5ba166bae1a39..2c5d4ae100031 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -24,7 +24,9 @@ , src ? null , srcs ? null +, preUnpack ? null , unpackPhase ? null +, postUnpack ? null , cargoPatches ? [] , patches ? [] , sourceRoot ? null @@ -68,7 +70,7 @@ let if cargoVendorDir != null then null else if cargoLock != null then importCargoLock cargoLock else fetchCargoTarball ({ - inherit src srcs sourceRoot unpackPhase cargoUpdateHook; + inherit src srcs sourceRoot preUnpack unpackPhase postUnpack cargoUpdateHook; name = cargoDepsName; patches = cargoPatches; } // lib.optionalAttrs (args ? cargoHash) { |