diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2015-04-23 15:14:34 +0200 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2015-04-23 15:26:23 +0200 |
| commit | 0cde1dc52425f12be6f7311737abe98813e43c29 (patch) | |
| tree | bd5be5e9072f8092896683e36c7b6af3307f9d5f /pkgs/build-support/rust/default.nix | |
| parent | e42c17ee9709c8fddbaee7d79c0d13f330443582 (diff) | |
| download | nixpkgs-0cde1dc52425f12be6f7311737abe98813e43c29.tar nixpkgs-0cde1dc52425f12be6f7311737abe98813e43c29.tar.gz nixpkgs-0cde1dc52425f12be6f7311737abe98813e43c29.tar.bz2 nixpkgs-0cde1dc52425f12be6f7311737abe98813e43c29.tar.lz nixpkgs-0cde1dc52425f12be6f7311737abe98813e43c29.tar.xz nixpkgs-0cde1dc52425f12be6f7311737abe98813e43c29.tar.zst nixpkgs-0cde1dc52425f12be6f7311737abe98813e43c29.zip | |
cargo: Remove setupHook
Instead, move that code into buildRustPackage. The setup hook was only doing part of the work anyway, and having it in a separate place was obscuring what was really going on.
Diffstat (limited to 'pkgs/build-support/rust/default.nix')
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 6a5e4b86194..37175114d81 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -19,6 +19,12 @@ in stdenv.mkDerivation (args // { configurePhase = args.configurePhase or "true"; postUnpack = '' + echo "Using cargo deps from $cargoDeps" + cp -r $cargoDeps deps + chmod +w deps -R + + export CARGO_HOME=$(realpath deps) + echo "Using rust registry from $rustRegistry" ( cd $sourceRoot |